From cc86854c4efefe21dbcd2746a05c379b8f1fb479 Mon Sep 17 00:00:00 2001
From: Servo WPT Sync <32481905+servo-wpt-sync@users.noreply.github.com>
Date: Sun, 13 Aug 2023 00:53:29 -0400
Subject: [PATCH] Update web-platform-tests to revision
 b'785ef6ac7190e22df4a4d8a664022abcd0bb752c' (#30095)

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 ...rd-break-auto-phrase-wbr-nobr-001.html.ini |    2 +
 ...rd-break-auto-phrase-wbr-nobr-002.html.ini |    2 +
 .../cssbox-content-box-001.html.ini           |    2 +
 .../cssbox-content-box-002.html.ini           |    2 +
 .../transform-box/cssbox-content-box.html.ini |    2 -
 .../wide-keyword-fallback-002.html.ini        |    2 +
 ...scroll-behavior-smooth-navigation.html.ini |    3 +
 .../css-images.sub.tentative.html.ini         |    6 +
 .../worker-blob-fetch.tentative.window.js.ini |    3 +
 .../history-traversal/popstate_event.html.ini |    3 +
 ...eshow-events-iframe-contentWindow.html.ini |    3 -
 ...url-return-value-handling-dynamic.html.ini |    6 +
 .../nav-cancelation-2.sub.html.ini            |    3 +-
 .../cross-origin-objects.html.ini             |    1 +
 .../layers/2d.layer.global-filter.html.ini    |    2 +
 ...er-rendering-state-reset-in-layer.html.ini |    3 +
 .../reset/2d.reset.state.clip.html.ini        |    2 +
 .../reset/2d.reset.state.direction.html.ini   |    3 +
 .../reset/2d.reset.state.fill_style.html.ini  |    3 +
 .../reset/2d.reset.state.filter.html.ini      |    3 +
 .../reset/2d.reset.state.font.html.ini        |    3 +
 .../2d.reset.state.font_kerning.html.ini      |    3 +
 .../2d.reset.state.font_stretch.html.ini      |    3 +
 .../2d.reset.state.font_variant_caps.html.ini |    3 +
 .../2d.reset.state.global_alpha.html.ini      |    3 +
 ....state.global_composite_operation.html.ini |    3 +
 ...set.state.image_smoothing_enabled.html.ini |    3 +
 ...set.state.image_smoothing_quality.html.ini |    3 +
 .../2d.reset.state.letter_spacing.html.ini    |    3 +
 .../reset/2d.reset.state.line_cap.html.ini    |    3 +
 .../reset/2d.reset.state.line_dash.html.ini   |    3 +
 .../2d.reset.state.line_dash_offset.html.ini  |    3 +
 .../reset/2d.reset.state.line_join.html.ini   |    3 +
 .../reset/2d.reset.state.line_width.html.ini  |    3 +
 .../reset/2d.reset.state.miter_limit.html.ini |    3 +
 .../reset/2d.reset.state.shadow_blur.html.ini |    3 +
 .../2d.reset.state.shadow_color.html.ini      |    3 +
 .../2d.reset.state.shadow_offset_x.html.ini   |    3 +
 .../2d.reset.state.shadow_offset_y.html.ini   |    3 +
 .../2d.reset.state.stroke_style.html.ini      |    3 +
 .../reset/2d.reset.state.text_align.html.ini  |    3 +
 .../2d.reset.state.text_baseline.html.ini     |    3 +
 .../2d.reset.state.text_rendering.html.ini    |    3 +
 ...reset.state.transformation_matrix.html.ini |    3 +
 .../2d.reset.state.word_spacing.html.ini      |    3 +
 .../text/2d.text.fontVariantCaps2.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps3.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps4.html.ini    |    2 +
 ...text.measure.emHeights-low-ascent.html.ini |    3 +
 ...xt.measure.emHeights-zero-descent.html.ini |    3 +
 ...re.fontBoundingBox-reduced-ascent.html.ini |    3 +
 ...sure.fontBoundingBox-zero-descent.html.ini |    3 +
 .../element/text/fontVariantCaps-2.html.ini   |    2 -
 .../element/text/fontVariantCaps-3.html.ini   |    2 -
 .../element/text/fontVariantCaps-4.html.ini   |    2 -
 .../layers/2d.layer.global-filter.html.ini    |    2 +
 .../layers/2d.layer.global-filter.w.html.ini  |    2 +
 ...er-rendering-state-reset-in-layer.html.ini |    3 +
 ...ndering-state-reset-in-layer.worker.js.ini |    3 +
 .../offscreen/reset/2d.reset.basic.html.ini   |    3 +
 .../reset/2d.reset.basic.worker.js.ini        |    3 +
 .../reset/2d.reset.state.clip.html.ini        |    2 +
 .../reset/2d.reset.state.clip.w.html.ini      |    2 +
 .../reset/2d.reset.state.direction.html.ini   |    3 +
 .../2d.reset.state.direction.worker.js.ini    |    3 +
 .../reset/2d.reset.state.fill_style.html.ini  |    3 +
 .../2d.reset.state.fill_style.worker.js.ini   |    3 +
 .../reset/2d.reset.state.filter.html.ini      |    3 +
 .../reset/2d.reset.state.filter.worker.js.ini |    3 +
 .../reset/2d.reset.state.font.html.ini        |    3 +
 .../reset/2d.reset.state.font.worker.js.ini   |    3 +
 .../2d.reset.state.font_kerning.html.ini      |    3 +
 .../2d.reset.state.font_kerning.worker.js.ini |    3 +
 .../2d.reset.state.font_stretch.html.ini      |    3 +
 .../2d.reset.state.font_stretch.worker.js.ini |    3 +
 .../2d.reset.state.font_variant_caps.html.ini |    3 +
 ...eset.state.font_variant_caps.worker.js.ini |    3 +
 .../2d.reset.state.global_alpha.html.ini      |    3 +
 .../2d.reset.state.global_alpha.worker.js.ini |    3 +
 ....state.global_composite_operation.html.ini |    3 +
 ...e.global_composite_operation.worker.js.ini |    3 +
 ...set.state.image_smoothing_enabled.html.ini |    3 +
 ...tate.image_smoothing_enabled.worker.js.ini |    3 +
 ...set.state.image_smoothing_quality.html.ini |    3 +
 ...tate.image_smoothing_quality.worker.js.ini |    3 +
 .../2d.reset.state.letter_spacing.html.ini    |    3 +
 ...d.reset.state.letter_spacing.worker.js.ini |    3 +
 .../reset/2d.reset.state.line_cap.html.ini    |    3 +
 .../2d.reset.state.line_cap.worker.js.ini     |    3 +
 .../reset/2d.reset.state.line_dash.html.ini   |    3 +
 .../2d.reset.state.line_dash.worker.js.ini    |    3 +
 .../2d.reset.state.line_dash_offset.html.ini  |    3 +
 ...reset.state.line_dash_offset.worker.js.ini |    3 +
 .../reset/2d.reset.state.line_join.html.ini   |    3 +
 .../2d.reset.state.line_join.worker.js.ini    |    3 +
 .../reset/2d.reset.state.line_width.html.ini  |    3 +
 .../2d.reset.state.line_width.worker.js.ini   |    3 +
 .../reset/2d.reset.state.miter_limit.html.ini |    3 +
 .../2d.reset.state.miter_limit.worker.js.ini  |    3 +
 .../reset/2d.reset.state.shadow_blur.html.ini |    3 +
 .../2d.reset.state.shadow_blur.worker.js.ini  |    3 +
 .../2d.reset.state.shadow_color.html.ini      |    3 +
 .../2d.reset.state.shadow_color.worker.js.ini |    3 +
 .../2d.reset.state.shadow_offset_x.html.ini   |    3 +
 ....reset.state.shadow_offset_x.worker.js.ini |    3 +
 .../2d.reset.state.shadow_offset_y.html.ini   |    3 +
 ....reset.state.shadow_offset_y.worker.js.ini |    3 +
 .../2d.reset.state.stroke_style.html.ini      |    3 +
 .../2d.reset.state.stroke_style.worker.js.ini |    3 +
 .../reset/2d.reset.state.text_align.html.ini  |    3 +
 .../2d.reset.state.text_align.worker.js.ini   |    3 +
 .../2d.reset.state.text_baseline.html.ini     |    3 +
 ...2d.reset.state.text_baseline.worker.js.ini |    3 +
 .../2d.reset.state.text_rendering.html.ini    |    3 +
 ...d.reset.state.text_rendering.worker.js.ini |    3 +
 ...reset.state.transformation_matrix.html.ini |    3 +
 ....state.transformation_matrix.worker.js.ini |    3 +
 .../2d.reset.state.word_spacing.html.ini      |    3 +
 .../2d.reset.state.word_spacing.worker.js.ini |    3 +
 .../text/2d.text.fontVariantCaps1.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps2.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps3.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps4.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps5.html.ini    |    2 +
 .../text/2d.text.fontVariantCaps6.html.ini    |    2 +
 ...text.measure.emHeights-low-ascent.html.ini |    3 +
 ...measure.emHeights-low-ascent.worker.js.ini |    3 +
 ...xt.measure.emHeights-zero-descent.html.ini |    3 +
 ...asure.emHeights-zero-descent.worker.js.ini |    3 +
 ...re.fontBoundingBox-reduced-ascent.html.ini |    3 +
 ...ntBoundingBox-reduced-ascent.worker.js.ini |    3 +
 ...sure.fontBoundingBox-zero-descent.html.ini |    3 +
 ...fontBoundingBox-zero-descent.worker.js.ini |    3 +
 .../offscreen/text/fontVariantCaps-1.html.ini |    2 -
 .../offscreen/text/fontVariantCaps-2.html.ini |    2 -
 .../offscreen/text/fontVariantCaps-3.html.ini |    2 -
 .../offscreen/text/fontVariantCaps-4.html.ini |    2 -
 .../offscreen/text/fontVariantCaps-5.html.ini |    2 -
 .../offscreen/text/fontVariantCaps-6.html.ini |    2 -
 ...render-blocking-partial.tentative.html.ini |    2 +
 ...ocument-render-blocking.tentative.html.ini |    2 +
 ...nother-top-level-browsing-context.html.ini |    4 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    3 +-
 .../non-active-document.html.ini              |    6 -
 .../selectlist-ask-for-reset.html.ini}        |    2 +-
 ...electlist-explicit-size.tentative.html.ini |    2 +
 .../selectlist-font-size.tentative.html.ini   |    2 +
 ...ectlist-form-attribute.tentative.html.ini} |   30 +-
 ...ist-form-state-restore.tentative.html.ini} |    2 +-
 ...ectlist-form-submission.tentative.html.ini |    6 +
 .../selectlist-labels.tentative.html.ini      |    3 +
 .../selectlist-marker-part.tentative.html.ini |    2 +
 .../selectlist-marker-slot.tentative.html.ini |    2 +
 ...trary-content-displayed.tentative.html.ini |    2 +
 ...y-content-not-displayed.tentative.html.ini |    2 +
 ...list-pseudo-open-closed.tentative.html.ini |    6 +
 ...ist-required-attribute.tentative.html.ini} |    2 +-
 .../selectlist-rtl.tentative.html.ini         |    2 +
 ...selected-value-behavior.tentative.html.ini |    2 +
 ...ist-selected-value-part.tentative.html.ini |    2 +
 ...ist-selected-value-slot.tentative.html.ini |    2 +
 ...selectlist-user-select.tentative.html.ini} |    6 +-
 .../selectlist-validity.tentative.html.ini    |    6 +
 ...selectlist-value-option.tentative.html.ini |    3 +
 ...t-value-selectedOption.tentative.html.ini} |   22 +-
 ...lectlist-writingmode-lr.tentative.html.ini |    2 +
 ...lectlist-writingmode-rl.tentative.html.ini |    2 +
 ...electmenu-explicit-size.tentative.html.ini |    2 -
 .../selectmenu-font-size.tentative.html.ini   |    2 -
 ...ectmenu-form-submission.tentative.html.ini |    6 -
 .../selectmenu-labels.tentative.html.ini      |    3 -
 .../selectmenu-marker-part.tentative.html.ini |    2 -
 .../selectmenu-marker-slot.tentative.html.ini |    2 -
 ...trary-content-displayed.tentative.html.ini |    2 -
 ...y-content-not-displayed.tentative.html.ini |    2 -
 ...menu-pseudo-open-closed.tentative.html.ini |    6 -
 .../selectmenu-rtl.tentative.html.ini         |    2 -
 ...selected-value-behavior.tentative.html.ini |    2 -
 ...enu-selected-value-part.tentative.html.ini |    2 -
 ...enu-selected-value-slot.tentative.html.ini |    2 -
 .../selectmenu-user-select.tentative.html.ini |   12 -
 .../selectmenu-validity.tentative.html.ini    |    6 -
 ...selectmenu-value-option.tentative.html.ini |    3 -
 ...lectmenu-writingmode-lr.tentative.html.ini |    2 -
 ...lectmenu-writingmode-rl.tentative.html.ini |    2 -
 .../caption-methods.html.ini                  |    2 -
 .../parsing/DOMContentLoaded-defer.html.ini   |    3 +
 ...le-event-handler-settings-objects.html.ini |    3 +
 ...ob-entry-different-function-realm.html.ini |    5 +-
 .../webmessaging/with-ports/018.html.ini      |    4 +
 ...s-3P-window.partitioned.tentative.html.ini |    4 +
 .../Worker/Worker-constructor.html.ini        |    2 +
 tests/wpt/meta/MANIFEST.json                  | 2357 +++++++++++++----
 .../inline-negative-margin-001.html.ini       |    3 +
 .../cssbox-content-box-001.html.ini           |    2 +
 .../cssbox-content-box-002.html.ini           |    2 +
 .../transform-box/cssbox-content-box.html.ini |    2 -
 .../wide-keyword-fallback-002.html.ini        |    2 +
 .../selectmenu-ask-for-reset.html.ini         |   12 -
 ...lectmenu-form-attribute.tentative.html.ini |   42 -
 ...menu-form-state-restore.tentative.html.ini |    3 -
 ...ectmenu-form-submission.tentative.html.ini |    6 -
 .../selectmenu-labels.tentative.html.ini      |    3 -
 ...trary-content-displayed.tentative.html.ini |    2 -
 ...y-content-not-displayed.tentative.html.ini |    2 -
 ...menu-pseudo-open-closed.tentative.html.ini |    6 -
 ...menu-required-attribute.tentative.html.ini |    3 -
 .../selectmenu-validity.tentative.html.ini    |    6 -
 ...selectmenu-value-option.tentative.html.ini |    3 -
 ...nu-value-selectedOption.tentative.html.ini |   33 -
 ...lectmenu-writingmode-lr.tentative.html.ini |    2 -
 ...lectmenu-writingmode-rl.tentative.html.ini |    2 -
 .../crashtests/displaylocked-serialize.html   |    6 +-
 tests/wpt/tests/accname/META.yml              |    3 +-
 .../closewatcher-dialog-popover.html          |   94 +
 .../dialog-cancel-events-closewatcher.html}   |    0
 ...g-cancel-preventDefault-closewatcher.html} |    0
 .../tests/close-watcher/resources/helpers.js  |   58 +-
 .../user-activation-CloseWatcher.html         |   75 +
 .../close-watcher/user-activation-shared.html |  195 ++
 .../tests/close-watcher/user-activation.html  |  222 --
 tests/wpt/tests/core-aam/META.yml             |    1 +
 ...not-observed-by-service-worker.https.html} |    0
 .../support/fedcm-helper.sub.js               |   54 +-
 .../fedcm/manifest_with_no_accounts.json      |    5 +
 .../support/fedcm/no_accounts.py              |   25 +
 .../support/mark_signedin                     |   13 +
 .../support/mark_signedin.headers             |    2 +
 .../content-visibility-085.html               |   35 +
 .../font-size-adjust-reload-ref.html          |   26 +
 .../css-fonts/font-size-adjust-reload.html    |   25 +
 .../image-set-all-options-invalid.html        |   18 +
 .../mask-image/mask-origin-2-ref.html         |   35 -
 .../css-masking/mask-image/mask-origin-2.html |   77 -
 .../css/css-masking/parsing/mask-invalid.html |    2 +
 .../css-masking/parsing/mask-valid.sub.html   |    3 +-
 .../floated-input-in-inline-next-column.html  |   19 +
 .../sticky/position-sticky-details-crash.html |   10 +
 .../css/css-scroll-snap/overscroll-snap.html  |   48 +
 ...rd-break-auto-phrase-wbr-nobr-001-ref.html |   14 +
 .../word-break-auto-phrase-wbr-nobr-001.html  |   29 +
 ...rd-break-auto-phrase-wbr-nobr-002-ref.html |   13 +
 .../word-break-auto-phrase-wbr-nobr-002.html  |   30 +
 .../preserve3d-pseudo-element-ref.html        |    1 -
 .../preserve3d-pseudo-element.html            |    1 -
 ...t-box.html => cssbox-content-box-001.html} |    0
 .../transform-box/cssbox-content-box-002.html |   23 +
 ...tml => wide-keyword-fallback-001-ref.html} |    0
 ...ck.html => wide-keyword-fallback-001.html} |    2 +-
 .../wide-keyword-fallback-002-ref.html        |    7 +
 .../wide-keyword-fallback-002.html            |   25 +
 .../will-change-contents-crash.html           |   11 +
 .../motion/offset-path-shape-ellipse-003.html |    4 +-
 .../css/motion/offset-path-url-001-ref.html   |   19 +
 .../tests/css/motion/offset-path-url-001.html |   32 +
 .../css/motion/offset-path-url-002-ref.html   |   18 +
 .../tests/css/motion/offset-path-url-002.html |   35 +
 .../css/motion/offset-path-url-003-ref.html   |   18 +
 .../tests/css/motion/offset-path-url-003.html |   36 +
 .../css/motion/offset-path-url-004-ref.html   |   18 +
 .../tests/css/motion/offset-path-url-004.html |   36 +
 .../tests/css/motion/offset-path-url-005.html |   33 +
 .../tests/css/motion/offset-path-url-006.html |   33 +
 .../tests/css/motion/offset-path-url-007.html |   35 +
 .../css/motion/offset-path-url-008-ref.html   |   26 +
 .../tests/css/motion/offset-path-url-008.html |   45 +
 .../tests/css/motion/offset-path-url-009.html |   45 +
 .../tests/css/motion/offset-path-url-010.html |   45 +
 .../css/motion/offset-path-url-011-ref.html   |   18 +
 .../tests/css/motion/offset-path-url-011.html |   34 +
 .../css/motion/offset-path-url-crash.html     |   37 +
 .../tests/css/motion/offset-path-url-ref.html |   21 -
 .../wpt/tests/css/motion/offset-path-url.html |   27 -
 .../selectors/has-sibling-chrome-crash.html   |   10 +
 .../wpt/tests/css/selectors/user-invalid.html |   47 +-
 tests/wpt/tests/css/selectors/user-valid.html |   50 +-
 .../tests/docs/writing-tests/testharness.md   |    4 +-
 tests/wpt/tests/dpub-aam/META.yml             |    3 +-
 tests/wpt/tests/dpub-aria/META.yml            |    2 +-
 ...automatic-beacon-shared-storage.https.html |   44 +
 .../automatic-beacon-unfenced-top.https.html  |   57 +
 .../fenced-frame/deep-copy-config.https.html  |   27 +
 .../automatic-beacon-unfenced-page.html       |   19 +
 .../resources/fledge-bidding-logic.py         |   23 +-
 .../resources/fledge-decision-logic.py        |   34 +-
 .../resources/postmessage-config.html         |   14 +
 .../wpt/tests/fenced-frame/resources/utils.js |   25 +-
 .../showPicker-errors.https.window.js         |    6 +
 tests/wpt/tests/fledge/tentative/TODO         |    3 +-
 ...eave-ad-interest-group.https.sub.window.js |    6 +-
 .../fledge/tentative/resources/fledge-util.js |   36 +-
 .../resources/trusted-bidding-signals.py      |   20 +-
 .../resources/trusted-scoring-signals.py      |  127 +
 .../round-a-value.https.sub.window.js         |  160 ++
 ...rusted-bidding-signals.https.sub.window.js |   14 +-
 ...rusted-scoring-signals.https.sub.window.js |  409 +++
 .../wpt/tests/fonts/CanvasTest-ascent256.ttf  |  Bin 0 -> 2444 bytes
 tests/wpt/tests/fonts/CanvasTest-descent0.ttf |  Bin 0 -> 2444 bytes
 tests/wpt/tests/fonts/CanvasTest.ttf          |  Bin 2528 -> 2444 bytes
 tests/wpt/tests/graphics-aam/META.yml         |    3 +-
 ...ced-frame-bypass.tentative.https.window.js |    3 +-
 .../fenced-frame.tentative.https.window.js    |    3 +-
 .../html/anonymous-iframe/resources/common.js |    7 +-
 .../history-traversal/popstate_event.html     |    1 +
 .../2d.layer.global-filter-expected.html      |   17 +
 .../layers/2d.layer.global-filter.html        |   26 +
 ...states.alpha.blending.shadow-expected.html |    1 +
 ...r.global-states.alpha.blending.shadow.html |    1 +
 ...tates.alpha.composite.shadow-expected.html |    1 +
 ....global-states.alpha.composite.shadow.html |    1 +
 ...r.global-states.alpha.shadow-expected.html |    1 +
 .../2d.layer.global-states.alpha.shadow.html  |    1 +
 ...lobal-states.blending.shadow-expected.html |    1 +
 ...d.layer.global-states.blending.shadow.html |    1 +
 ...obal-states.composite.shadow-expected.html |    1 +
 ....layer.global-states.composite.shadow.html |    1 +
 ...filter.alpha.blending.shadow-expected.html |    1 +
 ...l-states.filter.alpha.blending.shadow.html |    1 +
 ...ilter.alpha.composite.shadow-expected.html |    1 +
 ...-states.filter.alpha.composite.shadow.html |    1 +
 ...l-states.filter.alpha.shadow-expected.html |    1 +
 ...yer.global-states.filter.alpha.shadow.html |    1 +
 ...tates.filter.blending.shadow-expected.html |    1 +
 ....global-states.filter.blending.shadow.html |    1 +
 ...ates.filter.composite.shadow-expected.html |    1 +
 ...global-states.filter.composite.shadow.html |    1 +
 ....global-states.filter.shadow-expected.html |    1 +
 .../2d.layer.global-states.filter.shadow.html |    1 +
 ...d.layer.global-states.shadow-expected.html |    1 +
 .../layers/2d.layer.global-states.shadow.html |    1 +
 ....layer-rendering-state-reset-in-layer.html |   56 +
 .../canvas/element/layers/2d.layer.reset.html |    2 +
 .../2d.layer.several-complex-expected.html    |    1 +
 .../layers/2d.layer.several-complex.html      |    2 +-
 .../reset/2d.reset.state.clip-expected.html   |   14 +
 .../element/reset/2d.reset.state.clip.html    |   23 +
 .../reset/2d.reset.state.direction.html       |   32 +
 .../reset/2d.reset.state.fill_style.html      |   32 +
 .../element/reset/2d.reset.state.filter.html  |   32 +
 .../element/reset/2d.reset.state.font.html    |   32 +
 .../reset/2d.reset.state.font_kerning.html    |   32 +
 .../reset/2d.reset.state.font_stretch.html    |   32 +
 .../2d.reset.state.font_variant_caps.html     |   32 +
 .../reset/2d.reset.state.global_alpha.html    |   32 +
 ...eset.state.global_composite_operation.html |   32 +
 ...d.reset.state.image_smoothing_enabled.html |   32 +
 ...d.reset.state.image_smoothing_quality.html |   32 +
 .../reset/2d.reset.state.letter_spacing.html  |   32 +
 .../reset/2d.reset.state.line_cap.html        |   32 +
 .../reset/2d.reset.state.line_dash.html       |   29 +
 .../2d.reset.state.line_dash_offset.html      |   32 +
 .../reset/2d.reset.state.line_join.html       |   32 +
 .../reset/2d.reset.state.line_width.html      |   32 +
 .../reset/2d.reset.state.miter_limit.html     |   32 +
 .../reset/2d.reset.state.shadow_blur.html     |   32 +
 .../reset/2d.reset.state.shadow_color.html    |   32 +
 .../reset/2d.reset.state.shadow_offset_x.html |   32 +
 .../reset/2d.reset.state.shadow_offset_y.html |   32 +
 .../reset/2d.reset.state.stroke_style.html    |   32 +
 .../reset/2d.reset.state.text_align.html      |   32 +
 .../reset/2d.reset.state.text_baseline.html   |   32 +
 .../reset/2d.reset.state.text_rendering.html  |   32 +
 .../2d.reset.state.transformation_matrix.html |   29 +
 .../reset/2d.reset.state.word_spacing.html    |   32 +
 ...=> 2d.text.fontVariantCaps1-expected.html} |    0
 ...s-1.html => 2d.text.fontVariantCaps1.html} |    2 +-
 ... 2d.text.fontVariantCaps2-unexpected.html} |    0
 ...s-2.html => 2d.text.fontVariantCaps2.html} |    2 +-
 ...=> 2d.text.fontVariantCaps3-expected.html} |    0
 ...s-3.html => 2d.text.fontVariantCaps3.html} |    2 +-
 .../2d.text.fontVariantCaps4-expected.html    |   12 +
 ...s-4.html => 2d.text.fontVariantCaps4.html} |    2 +-
 .../2d.text.fontVariantCaps5-expected.html    |   12 +
 ...s-5.html => 2d.text.fontVariantCaps5.html} |    2 +-
 .../2d.text.fontVariantCaps6-expected.html    |   12 +
 ...s-6.html => 2d.text.fontVariantCaps6.html} |    2 +-
 .../2d.text.measure.emHeights-low-ascent.html |   45 +
 ...d.text.measure.emHeights-zero-descent.html |   45 +
 .../text/2d.text.measure.emHeights.html       |   14 +-
 ...easure.fontBoundingBox-reduced-ascent.html |   43 +
 ....measure.fontBoundingBox-zero-descent.html |   43 +
 .../text/2d.text.measure.fontBoundingBox.html |   11 +-
 .../2d.layer.global-filter-expected.html      |   17 +
 .../layers/2d.layer.global-filter.html        |   29 +
 .../layers/2d.layer.global-filter.w.html      |   43 +
 ...states.alpha.blending.shadow-expected.html |    1 +
 ...r.global-states.alpha.blending.shadow.html |    1 +
 ...global-states.alpha.blending.shadow.w.html |    1 +
 ...tates.alpha.composite.shadow-expected.html |    1 +
 ....global-states.alpha.composite.shadow.html |    1 +
 ...lobal-states.alpha.composite.shadow.w.html |    1 +
 ...r.global-states.alpha.shadow-expected.html |    1 +
 .../2d.layer.global-states.alpha.shadow.html  |    1 +
 ...2d.layer.global-states.alpha.shadow.w.html |    1 +
 ...lobal-states.blending.shadow-expected.html |    1 +
 ...d.layer.global-states.blending.shadow.html |    1 +
 ...layer.global-states.blending.shadow.w.html |    1 +
 ...obal-states.composite.shadow-expected.html |    1 +
 ....layer.global-states.composite.shadow.html |    1 +
 ...ayer.global-states.composite.shadow.w.html |    1 +
 ...filter.alpha.blending.shadow-expected.html |    1 +
 ...l-states.filter.alpha.blending.shadow.html |    1 +
 ...states.filter.alpha.blending.shadow.w.html |    1 +
 ...ilter.alpha.composite.shadow-expected.html |    1 +
 ...-states.filter.alpha.composite.shadow.html |    1 +
 ...tates.filter.alpha.composite.shadow.w.html |    1 +
 ...l-states.filter.alpha.shadow-expected.html |    1 +
 ...yer.global-states.filter.alpha.shadow.html |    1 +
 ...r.global-states.filter.alpha.shadow.w.html |    1 +
 ...tates.filter.blending.shadow-expected.html |    1 +
 ....global-states.filter.blending.shadow.html |    1 +
 ...lobal-states.filter.blending.shadow.w.html |    1 +
 ...ates.filter.composite.shadow-expected.html |    1 +
 ...global-states.filter.composite.shadow.html |    1 +
 ...obal-states.filter.composite.shadow.w.html |    1 +
 ....global-states.filter.shadow-expected.html |    1 +
 .../2d.layer.global-states.filter.shadow.html |    1 +
 ...d.layer.global-states.filter.shadow.w.html |    1 +
 ...d.layer.global-states.shadow-expected.html |    1 +
 .../layers/2d.layer.global-states.shadow.html |    1 +
 .../2d.layer.global-states.shadow.w.html      |    1 +
 ....layer-rendering-state-reset-in-layer.html |   57 +
 ...r-rendering-state-reset-in-layer.worker.js |   52 +
 .../offscreen/layers/2d.layer.reset.html      |    2 +
 .../offscreen/layers/2d.layer.reset.w.html    |    2 +
 .../2d.layer.several-complex-expected.html    |    1 +
 .../layers/2d.layer.several-complex.html      |    2 +-
 .../layers/2d.layer.several-complex.w.html    |    2 +-
 .../offscreen/reset/2d.reset.basic.html       |   36 +
 .../offscreen/reset/2d.reset.basic.worker.js  |   31 +
 .../reset/2d.reset.state.clip-expected.html   |   14 +
 .../offscreen/reset/2d.reset.state.clip.html  |   26 +
 .../reset/2d.reset.state.clip.w.html          |   40 +
 .../reset/2d.reset.state.direction.html       |   33 +
 .../reset/2d.reset.state.direction.worker.js  |   28 +
 .../reset/2d.reset.state.fill_style.html      |   33 +
 .../reset/2d.reset.state.fill_style.worker.js |   28 +
 .../reset/2d.reset.state.filter.html          |   33 +
 .../reset/2d.reset.state.filter.worker.js     |   28 +
 .../offscreen/reset/2d.reset.state.font.html  |   33 +
 .../reset/2d.reset.state.font.worker.js       |   28 +
 .../reset/2d.reset.state.font_kerning.html    |   33 +
 .../2d.reset.state.font_kerning.worker.js     |   28 +
 .../reset/2d.reset.state.font_stretch.html    |   33 +
 .../2d.reset.state.font_stretch.worker.js     |   28 +
 .../2d.reset.state.font_variant_caps.html     |   33 +
 ...2d.reset.state.font_variant_caps.worker.js |   28 +
 .../reset/2d.reset.state.global_alpha.html    |   33 +
 .../2d.reset.state.global_alpha.worker.js     |   28 +
 ...eset.state.global_composite_operation.html |   33 +
 ...state.global_composite_operation.worker.js |   28 +
 ...d.reset.state.image_smoothing_enabled.html |   33 +
 ...et.state.image_smoothing_enabled.worker.js |   28 +
 ...d.reset.state.image_smoothing_quality.html |   33 +
 ...et.state.image_smoothing_quality.worker.js |   28 +
 .../reset/2d.reset.state.letter_spacing.html  |   33 +
 .../2d.reset.state.letter_spacing.worker.js   |   28 +
 .../reset/2d.reset.state.line_cap.html        |   33 +
 .../reset/2d.reset.state.line_cap.worker.js   |   28 +
 .../reset/2d.reset.state.line_dash.html       |   30 +
 .../reset/2d.reset.state.line_dash.worker.js  |   25 +
 .../2d.reset.state.line_dash_offset.html      |   33 +
 .../2d.reset.state.line_dash_offset.worker.js |   28 +
 .../reset/2d.reset.state.line_join.html       |   33 +
 .../reset/2d.reset.state.line_join.worker.js  |   28 +
 .../reset/2d.reset.state.line_width.html      |   33 +
 .../reset/2d.reset.state.line_width.worker.js |   28 +
 .../reset/2d.reset.state.miter_limit.html     |   33 +
 .../2d.reset.state.miter_limit.worker.js      |   28 +
 .../reset/2d.reset.state.shadow_blur.html     |   33 +
 .../2d.reset.state.shadow_blur.worker.js      |   28 +
 .../reset/2d.reset.state.shadow_color.html    |   33 +
 .../2d.reset.state.shadow_color.worker.js     |   28 +
 .../reset/2d.reset.state.shadow_offset_x.html |   33 +
 .../2d.reset.state.shadow_offset_x.worker.js  |   28 +
 .../reset/2d.reset.state.shadow_offset_y.html |   33 +
 .../2d.reset.state.shadow_offset_y.worker.js  |   28 +
 .../reset/2d.reset.state.stroke_style.html    |   33 +
 .../2d.reset.state.stroke_style.worker.js     |   28 +
 .../reset/2d.reset.state.text_align.html      |   33 +
 .../reset/2d.reset.state.text_align.worker.js |   28 +
 .../reset/2d.reset.state.text_baseline.html   |   33 +
 .../2d.reset.state.text_baseline.worker.js    |   28 +
 .../reset/2d.reset.state.text_rendering.html  |   33 +
 .../2d.reset.state.text_rendering.worker.js   |   28 +
 .../2d.reset.state.transformation_matrix.html |   30 +
 ...eset.state.transformation_matrix.worker.js |   25 +
 .../reset/2d.reset.state.word_spacing.html    |   33 +
 .../2d.reset.state.word_spacing.worker.js     |   28 +
 ...=> 2d.text.fontVariantCaps1-expected.html} |    0
 ...s-1.html => 2d.text.fontVariantCaps1.html} |    2 +-
 ... 2d.text.fontVariantCaps2-unexpected.html} |    0
 ...s-2.html => 2d.text.fontVariantCaps2.html} |    2 +-
 ...=> 2d.text.fontVariantCaps3-expected.html} |    0
 ...s-3.html => 2d.text.fontVariantCaps3.html} |    2 +-
 .../2d.text.fontVariantCaps4-expected.html    |   16 +
 ...s-4.html => 2d.text.fontVariantCaps4.html} |    2 +-
 .../2d.text.fontVariantCaps5-expected.html    |   16 +
 ...s-5.html => 2d.text.fontVariantCaps5.html} |    2 +-
 .../2d.text.fontVariantCaps6-expected.html    |   16 +
 ...s-6.html => 2d.text.fontVariantCaps6.html} |    2 +-
 .../2d.text.measure.emHeights-low-ascent.html |   34 +
 ...ext.measure.emHeights-low-ascent.worker.js |   30 +
 ...d.text.measure.emHeights-zero-descent.html |   34 +
 ...t.measure.emHeights-zero-descent.worker.js |   30 +
 .../text/2d.text.measure.emHeights.html       |   14 +-
 .../text/2d.text.measure.emHeights.worker.js  |   14 +-
 ...easure.fontBoundingBox-reduced-ascent.html |   32 +
 ...e.fontBoundingBox-reduced-ascent.worker.js |   28 +
 ....measure.fontBoundingBox-zero-descent.html |   32 +
 ...ure.fontBoundingBox-zero-descent.worker.js |   28 +
 .../text/2d.text.measure.fontBoundingBox.html |   11 +-
 .../2d.text.measure.fontBoundingBox.worker.js |   11 +-
 .../2d-getcontext-options.any.js              |    7 +-
 .../html/canvas/tools/yaml-new/layers.yaml    |   66 +-
 .../html/canvas/tools/yaml-new/reset.yaml     |  156 +-
 .../html/canvas/tools/yaml-new/text.yaml      |   97 +-
 ...ent-render-blocking-partial.tentative.html |   34 +
 .../document-render-blocking.tentative.html   |   33 +
 .../html/dom/render-blocking/support/utils.js |   10 +
 ...amed-attribute-detached-context-crash.html |   13 +
 .../selectlist-ask-for-reset.html             |  119 +
 .../selectlist-disabled.tentative.html}       |   10 +-
 .../selectlist-events.tentative.html}         |  190 +-
 ...electlist-explicit-size-ref.tentative.html |    9 +
 .../selectlist-explicit-size.tentative.html   |   14 +
 .../selectlist-font-size-ref.tentative.html   |    8 +
 .../selectlist-font-size.tentative.html       |   13 +
 .../selectlist-form-attribute.tentative.html} |    4 +-
 .../selectlist-form-elements.tentative.html}  |   12 +-
 ...ectlist-form-state-restore.tentative.html} |   14 +-
 ...selectlist-form-submission.tentative.html} |   22 +-
 .../selectlist-keyboard.tentative.html        |  123 +
 .../selectlist-labels.tentative.html          |   29 +
 ...tbox-fallback-change-crash.tentative.html} |   12 +-
 .../selectlist-many-options.tentative.html}   |   24 +-
 ...ist-marker-end-aligned-ref.tentative.html} |    8 +-
 ...ectlist-marker-end-aligned.tentative.html} |   12 +-
 .../selectlist-marker-part-ref.html           |    9 +
 .../selectlist-marker-part.tentative.html}    |    8 +-
 .../selectlist-marker-slot-ref.html           |   13 +
 .../selectlist-marker-slot.tentative.html}    |    6 +-
 ...arker-visible-overflow-ref.tentative.html} |    6 +-
 ...st-marker-visible-overflow.tentative.html} |   10 +-
 .../selectlist-nested.tentative.html}         |   62 +-
 ...rary-content-displayed-ref.tentative.html} |    8 +-
 ...rbitrary-content-displayed.tentative.html} |   16 +-
 ...-content-not-displayed-ref.tentative.html} |    4 +-
 ...rary-content-not-displayed.tentative.html} |   18 +-
 ...electlist-option-focusable.tentative.html} |   26 +-
 .../selectlist-overflow-x-ref.tentative.html} |    8 +-
 .../selectlist-overflow-x.tentative.html}     |   12 +-
 .../selectlist-parts-structure.tentative.html |  530 ++++
 ...-popover-position-with-zoom.tentative.html |  135 +
 ...selectlist-popover-position.tentative.html |  115 +
 .../selectlist-popover.tentative.html         |  107 +
 ...-light-dismiss-invalidation.tentative.html |   47 +
 ...lectlist-pseudo-open-closed.tentative.html |   61 +
 ...ectlist-required-attribute.tentative.html} |   34 +-
 .../selectlist-rtl-ref.tentative.html         |    9 +
 .../selectlist-rtl.tentative.html}            |   10 +-
 ...electlist-selected-value-behavior-ref.html |    9 +
 ...st-selected-value-behavior.tentative.html} |    6 +-
 .../selectlist-selected-value-part-ref.html   |    9 +
 ...ctlist-selected-value-part.tentative.html} |    8 +-
 .../selectlist-selected-value-slot-ref.html   |   13 +
 ...ctlist-selected-value-slot.tentative.html} |    6 +-
 .../selectlist-tab-navigation.tentative.html} |   12 +-
 .../selectlist-tabindex-order.tentative.html} |    8 +-
 .../selectlist-user-select.tentative.html}    |   28 +-
 .../selectlist-validity.tentative.html        |   88 +
 .../selectlist-value-option.tentative.html}   |   12 +-
 ...ctlist-value-selectedOption.tentative.html |  224 ++
 .../selectlist-writingmode-lr.tentative.html} |    6 +-
 .../selectlist-writingmode-rl.tentative.html} |    6 +-
 .../selectlist-writingmode-tb-ref.html        |    4 +
 .../support/back.html                         |    1 +
 .../support/fake-selectlist.js}               |   24 +-
 .../support/selectlist_button_icon.svg}       |    0
 .../selectmenu-ask-for-reset.html             |  119 -
 ...electmenu-explicit-size-ref.tentative.html |    9 -
 .../selectmenu-explicit-size.tentative.html   |   14 -
 .../selectmenu-font-size-ref.tentative.html   |    8 -
 .../selectmenu-font-size.tentative.html       |   13 -
 .../selectmenu-keyboard.tentative.html        |  123 -
 .../selectmenu-labels.tentative.html          |   29 -
 .../selectmenu-marker-part-ref.html           |    9 -
 .../selectmenu-marker-slot-ref.html           |   13 -
 .../selectmenu-parts-structure.tentative.html |  530 ----
 ...-popover-position-with-zoom.tentative.html |  135 -
 ...selectmenu-popover-position.tentative.html |  115 -
 .../selectmenu-popover.tentative.html         |  107 -
 ...-light-dismiss-invalidation.tentative.html |   47 -
 ...lectmenu-pseudo-open-closed.tentative.html |   61 -
 .../selectmenu-rtl-ref.tentative.html         |    9 -
 ...electmenu-selected-value-behavior-ref.html |    9 -
 .../selectmenu-selected-value-part-ref.html   |    9 -
 .../selectmenu-selected-value-slot-ref.html   |   13 -
 .../selectmenu-validity.tentative.html        |   88 -
 ...ctmenu-value-selectedOption.tentative.html |  224 --
 .../selectmenu-writingmode-tb-ref.html        |    4 -
 ...avigate-navigation-back-same-document.html |    1 +
 .../callback-idle-periods.html                |    2 +-
 .../test_partial_interface_of.html            |    1 -
 .../test_partial_interface_of.html            |    1 -
 .../css/animation-range-visual-test.html      |    1 +
 .../scroll-timeline-invalidation.html         |   19 +-
 .../view-timelines/contain-alignment.html     |  112 +
 .../view-timelines/subject-br-crash.html      |   14 +
 tests/wpt/tests/tools/lint/lint.py            |   10 +-
 tests/wpt/tests/tools/lint/rules.py           |    4 +-
 .../tests/tools/lint/tests/test_file_lints.py |    3 +-
 .../tools/manifest/tests/test_sourcefile.py   |   22 +-
 .../wptrunner/wptrunner/browsers/chrome.py    |   17 +-
 .../wptrunner/browsers/content_shell.py       |   16 +-
 .../executors/executorcontentshell.py         |    6 +
 .../tools/wptrunner/wptrunner/wptrunner.py    |   10 +-
 tests/wpt/tests/wai-aria/META.yml             |    3 -
 .../tests/wai-aria/role/fallback-roles.html   |   38 +-
 tests/wpt/tests/wai-aria/role/grid-roles.html |   53 +
 .../audiocontext-suspend-resume-close.html    |    4 +-
 .../webcodecs/video-decoder.https.any.js      |   39 +-
 .../capture_screenshot/__init__.py            |    2 +-
 .../RTCPeerConnection-removeTrack.https.html  |    2 +
 .../RTCRtpSender-replaceTrack.https.html      |    1 -
 .../webrtc/RTCRtpSender-setParameters.html    |    1 -
 .../RTCRtpTransceiver-stopping.https.html     |   15 +-
 629 files changed, 11267 insertions(+), 3403 deletions(-)
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-001.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-002.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/css-variables/wide-keyword-fallback-002.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.global-filter.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.clip.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.direction.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.fill_style.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.filter.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_kerning.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_stretch.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_variant_caps.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_alpha.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_composite_operation.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.letter_spacing.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_cap.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_join.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_width.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.miter_limit.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_blur.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_color.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.stroke_style.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_align.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_baseline.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_rendering.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.transformation_matrix.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.word_spacing.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-2.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-3.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-4.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.w.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.w.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-1.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-2.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-3.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-4.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-5.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-6.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking-partial.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/{the-selectmenu-element/selectmenu-ask-for-reset.html.ini => the-selectlist-element/selectlist-ask-for-reset.html.ini} (88%)
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html.ini
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/{the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini => the-selectlist-element/selectlist-form-attribute.tentative.html.ini} (52%)
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/{the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini => the-selectlist-element/selectlist-form-state-restore.tentative.html.ini} (58%)
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html.ini
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/{the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini => the-selectlist-element/selectlist-required-attribute.tentative.html.ini} (50%)
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html.ini
 rename tests/wpt/{meta/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini => meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html.ini} (59%)
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html.ini
 rename tests/wpt/meta-legacy-layout/html/semantics/forms/{the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini => the-selectlist-element/selectlist-value-selectedOption.tentative.html.ini} (74%)
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/webmessaging/with-ports/018.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-001.html.ini
 create mode 100644 tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-002.html.ini
 delete mode 100644 tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box.html.ini
 create mode 100644 tests/wpt/meta/css/css-variables/wide-keyword-fallback-002.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini
 create mode 100644 tests/wpt/tests/close-watcher/closewatcher-dialog-popover.html
 rename tests/wpt/tests/{html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html => close-watcher/dialog-cancel-events-closewatcher.html} (100%)
 rename tests/wpt/tests/{html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html => close-watcher/dialog-cancel-preventDefault-closewatcher.html} (100%)
 create mode 100644 tests/wpt/tests/close-watcher/user-activation-CloseWatcher.html
 create mode 100644 tests/wpt/tests/close-watcher/user-activation-shared.html
 delete mode 100644 tests/wpt/tests/close-watcher/user-activation.html
 rename tests/wpt/tests/credential-management/{fedcm-not-observer-by-service-worker.https.html => fedcm-not-observed-by-service-worker.https.html} (100%)
 create mode 100644 tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json
 create mode 100644 tests/wpt/tests/credential-management/support/fedcm/no_accounts.py
 create mode 100644 tests/wpt/tests/credential-management/support/mark_signedin
 create mode 100644 tests/wpt/tests/credential-management/support/mark_signedin.headers
 create mode 100644 tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html
 create mode 100644 tests/wpt/tests/css/css-fonts/font-size-adjust-reload-ref.html
 create mode 100644 tests/wpt/tests/css/css-fonts/font-size-adjust-reload.html
 create mode 100644 tests/wpt/tests/css/css-images/image-set/image-set-all-options-invalid.html
 delete mode 100644 tests/wpt/tests/css/css-masking/mask-image/mask-origin-2-ref.html
 delete mode 100644 tests/wpt/tests/css/css-masking/mask-image/mask-origin-2.html
 create mode 100644 tests/wpt/tests/css/css-multicol/crashtests/floated-input-in-inline-next-column.html
 create mode 100644 tests/wpt/tests/css/css-position/sticky/position-sticky-details-crash.html
 create mode 100644 tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html
 create mode 100644 tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html
 create mode 100644 tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html
 create mode 100644 tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html
 create mode 100644 tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html
 rename tests/wpt/tests/css/css-transforms/transform-box/{cssbox-content-box.html => cssbox-content-box-001.html} (100%)
 create mode 100644 tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box-002.html
 rename tests/wpt/tests/css/css-variables/{wide-keyword-fallback-ref.html => wide-keyword-fallback-001-ref.html} (100%)
 rename tests/wpt/tests/css/css-variables/{wide-keyword-fallback.html => wide-keyword-fallback-001.html} (91%)
 create mode 100644 tests/wpt/tests/css/css-variables/wide-keyword-fallback-002-ref.html
 create mode 100644 tests/wpt/tests/css/css-variables/wide-keyword-fallback-002.html
 create mode 100644 tests/wpt/tests/css/css-will-change/will-change-contents-crash.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-001-ref.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-001.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-002-ref.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-002.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-003-ref.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-003.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-004-ref.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-004.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-005.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-006.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-007.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-008-ref.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-008.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-009.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-010.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-011-ref.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-011.html
 create mode 100644 tests/wpt/tests/css/motion/offset-path-url-crash.html
 delete mode 100644 tests/wpt/tests/css/motion/offset-path-url-ref.html
 delete mode 100644 tests/wpt/tests/css/motion/offset-path-url.html
 create mode 100644 tests/wpt/tests/css/selectors/has-sibling-chrome-crash.html
 create mode 100644 tests/wpt/tests/fenced-frame/automatic-beacon-shared-storage.https.html
 create mode 100644 tests/wpt/tests/fenced-frame/automatic-beacon-unfenced-top.https.html
 create mode 100644 tests/wpt/tests/fenced-frame/resources/automatic-beacon-unfenced-page.html
 create mode 100644 tests/wpt/tests/fenced-frame/resources/postmessage-config.html
 create mode 100644 tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
 create mode 100644 tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js
 create mode 100644 tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js
 create mode 100644 tests/wpt/tests/fonts/CanvasTest-ascent256.ttf
 create mode 100644 tests/wpt/tests/fonts/CanvasTest-descent0.ttf
 create mode 100644 tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html
 create mode 100644 tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter.html
 create mode 100644 tests/wpt/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip-expected.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.direction.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.fill_style.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.filter.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_kerning.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_stretch.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_variant_caps.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_alpha.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_composite_operation.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.letter_spacing.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_cap.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash_offset.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_join.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_width.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.miter_limit.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_blur.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_color.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.stroke_style.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_align.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_baseline.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_rendering.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.transformation_matrix.html
 create mode 100644 tests/wpt/tests/html/canvas/element/reset/2d.reset.state.word_spacing.html
 rename tests/wpt/tests/html/canvas/element/text/{reference/fontVariantCaps-1-ref.html => 2d.text.fontVariantCaps1-expected.html} (100%)
 rename tests/wpt/tests/html/canvas/element/text/{fontVariantCaps-1.html => 2d.text.fontVariantCaps1.html} (90%)
 rename tests/wpt/tests/html/canvas/element/text/{reference/fontVariantCaps-2-ref.html => 2d.text.fontVariantCaps2-unexpected.html} (100%)
 rename tests/wpt/tests/html/canvas/element/text/{fontVariantCaps-2.html => 2d.text.fontVariantCaps2.html} (89%)
 rename tests/wpt/tests/html/canvas/element/text/{reference/fontVariantCaps-3-ref.html => 2d.text.fontVariantCaps3-expected.html} (100%)
 rename tests/wpt/tests/html/canvas/element/text/{fontVariantCaps-3.html => 2d.text.fontVariantCaps3.html} (91%)
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html
 rename tests/wpt/tests/html/canvas/element/text/{fontVariantCaps-4.html => 2d.text.fontVariantCaps4.html} (91%)
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html
 rename tests/wpt/tests/html/canvas/element/text/{fontVariantCaps-5.html => 2d.text.fontVariantCaps5.html} (91%)
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html
 rename tests/wpt/tests/html/canvas/element/text/{fontVariantCaps-6.html => 2d.text.fontVariantCaps6.html} (91%)
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip-expected.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.w.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js
 rename tests/wpt/tests/html/canvas/offscreen/text/{reference/fontVariantCaps-1-ref.html => 2d.text.fontVariantCaps1-expected.html} (100%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{fontVariantCaps-1.html => 2d.text.fontVariantCaps1.html} (96%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{reference/fontVariantCaps-2-ref.html => 2d.text.fontVariantCaps2-unexpected.html} (100%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{fontVariantCaps-2.html => 2d.text.fontVariantCaps2.html} (95%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{reference/fontVariantCaps-3-ref.html => 2d.text.fontVariantCaps3-expected.html} (100%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{fontVariantCaps-3.html => 2d.text.fontVariantCaps3.html} (96%)
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html
 rename tests/wpt/tests/html/canvas/offscreen/text/{fontVariantCaps-4.html => 2d.text.fontVariantCaps4.html} (96%)
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html
 rename tests/wpt/tests/html/canvas/offscreen/text/{fontVariantCaps-5.html => 2d.text.fontVariantCaps5.html} (96%)
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html
 rename tests/wpt/tests/html/canvas/offscreen/text/{fontVariantCaps-6.html => 2d.text.fontVariantCaps6.html} (96%)
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js
 create mode 100644 tests/wpt/tests/html/dom/render-blocking/document-render-blocking-partial.tentative.html
 create mode 100644 tests/wpt/tests/html/dom/render-blocking/document-render-blocking.tentative.html
 create mode 100644 tests/wpt/tests/html/dom/render-blocking/support/utils.js
 create mode 100644 tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-named-attribute-detached-context-crash.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-disabled.tentative.html => the-selectlist-element/selectlist-disabled.tentative.html} (72%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-events.tentative.html => the-selectlist-element/selectlist-events.tentative.html} (55%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size-ref.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-form-attribute.tentative.html => the-selectlist-element/selectlist-form-attribute.tentative.html} (98%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-form-elements.tentative.html => the-selectlist-element/selectlist-form-elements.tentative.html} (68%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-form-state-restore.tentative.html => the-selectlist-element/selectlist-form-state-restore.tentative.html} (76%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-form-submission.tentative.html => the-selectlist-element/selectlist-form-submission.tentative.html} (68%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-keyboard.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html => the-selectlist-element/selectlist-listbox-fallback-change-crash.tentative.html} (77%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-many-options.tentative.html => the-selectlist-element/selectlist-many-options.tentative.html} (82%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-marker-end-aligned-ref.tentative.html => the-selectlist-element/selectlist-marker-end-aligned-ref.tentative.html} (74%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-marker-end-aligned.tentative.html => the-selectlist-element/selectlist-marker-end-aligned.tentative.html} (58%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part-ref.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-marker-part.tentative.html => the-selectlist-element/selectlist-marker-part.tentative.html} (56%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot-ref.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-marker-slot.tentative.html => the-selectlist-element/selectlist-marker-slot.tentative.html} (61%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-marker-visible-overflow-ref.tentative.html => the-selectlist-element/selectlist-marker-visible-overflow-ref.tentative.html} (67%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-marker-visible-overflow.tentative.html => the-selectlist-element/selectlist-marker-visible-overflow.tentative.html} (59%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-nested.tentative.html => the-selectlist-element/selectlist-nested.tentative.html} (52%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html => the-selectlist-element/selectlist-option-arbitrary-content-displayed-ref.tentative.html} (92%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html => the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html} (82%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html => the-selectlist-element/selectlist-option-arbitrary-content-not-displayed-ref.tentative.html} (89%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html => the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html} (57%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-option-focusable.tentative.html => the-selectlist-element/selectlist-option-focusable.tentative.html} (65%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-overflow-x-ref.tentative.html => the-selectlist-element/selectlist-overflow-x-ref.tentative.html} (63%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-overflow-x.tentative.html => the-selectlist-element/selectlist-overflow-x.tentative.html} (56%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-parts-structure.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position-with-zoom.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-light-dismiss-invalidation.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-required-attribute.tentative.html => the-selectlist-element/selectlist-required-attribute.tentative.html} (58%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-rtl.tentative.html => the-selectlist-element/selectlist-rtl.tentative.html} (50%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior-ref.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html => the-selectlist-element/selectlist-selected-value-behavior.tentative.html} (66%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part-ref.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-selected-value-part.tentative.html => the-selectlist-element/selectlist-selected-value-part.tentative.html} (53%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot-ref.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-selected-value-slot.tentative.html => the-selectlist-element/selectlist-selected-value-slot.tentative.html} (62%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-tab-navigation.tentative.html => the-selectlist-element/selectlist-tab-navigation.tentative.html} (71%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-tabindex-order.tentative.html => the-selectlist-element/selectlist-tabindex-order.tentative.html} (81%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-user-select.tentative.html => the-selectlist-element/selectlist-user-select.tentative.html} (81%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-value-option.tentative.html => the-selectlist-element/selectlist-value-option.tentative.html} (68%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-writingmode-lr.tentative.html => the-selectlist-element/selectlist-writingmode-lr.tentative.html} (56%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/selectmenu-writingmode-rl.tentative.html => the-selectlist-element/selectlist-writingmode-rl.tentative.html} (56%)
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-tb-ref.html
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element => the-selectlist-element}/support/back.html (66%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/support/fake-selectmenu.js => the-selectlist-element/support/fake-selectlist.js} (63%)
 rename tests/wpt/tests/html/semantics/forms/{the-selectmenu-element/support/selectmenu_button_icon.svg => the-selectlist-element/support/selectlist_button_icon.svg} (100%)
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size-ref.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size-ref.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl-ref.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html
 delete mode 100644 tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html
 create mode 100644 tests/wpt/tests/scroll-animations/view-timelines/contain-alignment.html
 create mode 100644 tests/wpt/tests/scroll-animations/view-timelines/subject-br-crash.html
 create mode 100644 tests/wpt/tests/wai-aria/role/grid-roles.html

diff --git a/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini
index cdeaf7f7080..282ab0b2525 100644
--- a/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html.ini
new file mode 100644
index 00000000000..f3e550ce2e1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-wbr-nobr-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html.ini
new file mode 100644
index 00000000000..4b95771bc4c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html.ini
@@ -0,0 +1,2 @@
+[word-break-auto-phrase-wbr-nobr-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-001.html.ini
new file mode 100644
index 00000000000..e755631d21c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-001.html.ini
@@ -0,0 +1,2 @@
+[cssbox-content-box-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-002.html.ini
new file mode 100644
index 00000000000..d6a7f222bb7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box-002.html.ini
@@ -0,0 +1,2 @@
+[cssbox-content-box-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box.html.ini b/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box.html.ini
deleted file mode 100644
index 39281adef09..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-transforms/transform-box/cssbox-content-box.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cssbox-content-box.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-variables/wide-keyword-fallback-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-variables/wide-keyword-fallback-002.html.ini
new file mode 100644
index 00000000000..2591556c763
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-variables/wide-keyword-fallback-002.html.ini
@@ -0,0 +1,2 @@
+[wide-keyword-fallback-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini
new file mode 100644
index 00000000000..977ef8f774c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/scroll-behavior-smooth-navigation.html.ini
@@ -0,0 +1,3 @@
+[scroll-behavior-smooth-navigation.html]
+  [Instant scrolling while doing history navigation.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
index f9de5391ad6..741af78eff8 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -146,3 +146,9 @@
 
   [list-style-image sec-fetch-site - HTTPS downgrade-upgrade]
     expected: FAIL
+
+  [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
+    expected: TIMEOUT
+
+  [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini b/tests/wpt/meta-legacy-layout/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini
index 5238f29ff20..fb5b7f774ee 100644
--- a/tests/wpt/meta-legacy-layout/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/private-network-access/worker-blob-fetch.tentative.window.js.ini
@@ -34,3 +34,6 @@
 
   [public https to local https: failure.]
     expected: FAIL
+
+  [private to private: success.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini
new file mode 100644
index 00000000000..61cb3241815
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/history-traversal/popstate_event.html.ini
@@ -0,0 +1,3 @@
+[popstate_event.html]
+  [Queue a task to fire popstate event]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index 149bcb4ff8c..51fd557bd7f 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -7,6 +7,3 @@
 
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
-
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
index 4b89cb499f8..8ae58f9f1e2 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-return-value-handling-dynamic.html.ini
@@ -13,3 +13,9 @@
 
   [0080 00FF 0100 set in href="" targeting a frame and clicked]
     expected: FAIL
+
+  [D83D DE0D set in href="" targeting a frame and clicked]
+    expected: FAIL
+
+  [DE0D 0041 set in href="" targeting a frame and clicked]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini
index 0e40ffc0656..9f7f24f662e 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/nav-cancelation-2.sub.html.ini
@@ -1,4 +1,3 @@
 [nav-cancelation-2.sub.html]
-  expected: TIMEOUT
   [grandparent cancels a pending navigation in a cross-origin grandchild]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
index 90eb9ed743b..24c9e5d3926 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/origin/cross-origin-objects/cross-origin-objects.html.ini
@@ -1,4 +1,5 @@
 [cross-origin-objects.html]
+  expected: TIMEOUT
   [Basic sanity-checking (cross-origin)]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.global-filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.global-filter.html.ini
new file mode 100644
index 00000000000..7c8370f5626
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.global-filter.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-filter.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini
new file mode 100644
index 00000000000..0c2a17e7e1d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini
@@ -0,0 +1,3 @@
+[2d.layer.layer-rendering-state-reset-in-layer.html]
+  [Tests that layers ignore the global context filter.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.clip.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.clip.html.ini
new file mode 100644
index 00000000000..2da19a2f792
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.clip.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.state.clip.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.direction.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.direction.html.ini
new file mode 100644
index 00000000000..37ba84dede3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.direction.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.direction.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.fill_style.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.fill_style.html.ini
new file mode 100644
index 00000000000..6662110b1a1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.fill_style.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.fill_style.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.filter.html.ini
new file mode 100644
index 00000000000..fbd0f558364
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.filter.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.filter.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font.html.ini
new file mode 100644
index 00000000000..6b0676316f9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_kerning.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_kerning.html.ini
new file mode 100644
index 00000000000..f723ac6322a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_kerning.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_kerning.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_stretch.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_stretch.html.ini
new file mode 100644
index 00000000000..c2fd8fa4289
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_stretch.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_stretch.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_variant_caps.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_variant_caps.html.ini
new file mode 100644
index 00000000000..75e4d5f04f5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.font_variant_caps.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_variant_caps.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_alpha.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_alpha.html.ini
new file mode 100644
index 00000000000..b0a26045a70
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_alpha.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.global_alpha.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_composite_operation.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_composite_operation.html.ini
new file mode 100644
index 00000000000..4e4b0805d67
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.global_composite_operation.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.global_composite_operation.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html.ini
new file mode 100644
index 00000000000..9dabb7e42b9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.image_smoothing_enabled.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html.ini
new file mode 100644
index 00000000000..2d7fe1e484f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.image_smoothing_quality.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.letter_spacing.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.letter_spacing.html.ini
new file mode 100644
index 00000000000..9c811c4999a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.letter_spacing.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.letter_spacing.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_cap.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_cap.html.ini
new file mode 100644
index 00000000000..b7d527633b6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_cap.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_cap.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash.html.ini
new file mode 100644
index 00000000000..61f771ded91
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_dash.html]
+  [check that the line dash is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini
new file mode 100644
index 00000000000..7a60aa8737e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_dash_offset.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_dash_offset.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_join.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_join.html.ini
new file mode 100644
index 00000000000..b5fae0241c4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_join.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_join.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_width.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_width.html.ini
new file mode 100644
index 00000000000..c6a583dd7a0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.line_width.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_width.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.miter_limit.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.miter_limit.html.ini
new file mode 100644
index 00000000000..e469bc43474
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.miter_limit.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.miter_limit.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_blur.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_blur.html.ini
new file mode 100644
index 00000000000..25866c52086
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_blur.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_blur.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_color.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_color.html.ini
new file mode 100644
index 00000000000..6e6e09c8e9d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_color.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_color.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html.ini
new file mode 100644
index 00000000000..45f353c74fb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_offset_x.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html.ini
new file mode 100644
index 00000000000..dc33ccfa1a2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_offset_y.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.stroke_style.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.stroke_style.html.ini
new file mode 100644
index 00000000000..6616dd8a847
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.stroke_style.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.stroke_style.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_align.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_align.html.ini
new file mode 100644
index 00000000000..97eb201d62b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_align.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_align.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_baseline.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_baseline.html.ini
new file mode 100644
index 00000000000..7921af65040
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_baseline.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_baseline.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_rendering.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_rendering.html.ini
new file mode 100644
index 00000000000..66e19bd1881
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.text_rendering.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_rendering.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.transformation_matrix.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.transformation_matrix.html.ini
new file mode 100644
index 00000000000..1e34d1c435b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.transformation_matrix.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.transformation_matrix.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.word_spacing.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.word_spacing.html.ini
new file mode 100644
index 00000000000..c480eafda05
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/reset/2d.reset.state.word_spacing.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.word_spacing.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
new file mode 100644
index 00000000000..2d73809345f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps2.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps2.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
new file mode 100644
index 00000000000..72b037dc26c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps3.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps3.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
new file mode 100644
index 00000000000..9614b6a8b10
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.fontVariantCaps4.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps4.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html.ini
new file mode 100644
index 00000000000..3938b9ca77f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.emHeights-low-ascent.html]
+  [Testing emHeights with reduced ascent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html.ini
new file mode 100644
index 00000000000..023860e2233
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.emHeights-zero-descent.html]
+  [Testing emHeights with zero descent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini
new file mode 100644
index 00000000000..18ecde23794
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.fontBoundingBox-reduced-ascent.html]
+  [Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini
new file mode 100644
index 00000000000..5182e511a42
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.fontBoundingBox-zero-descent.html]
+  [Testing fontBoundingBox for OffscreenCanvas with zero descent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-2.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-2.html.ini
deleted file mode 100644
index 484b3668394..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-2.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-3.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-3.html.ini
deleted file mode 100644
index dfe4880591e..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-3.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-4.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-4.html.ini
deleted file mode 100644
index c38d3a21e62..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/fontVariantCaps-4.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-4.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.html.ini
new file mode 100644
index 00000000000..7c8370f5626
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-filter.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.w.html.ini
new file mode 100644
index 00000000000..2ff1481c701
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.global-filter.w.html.ini
@@ -0,0 +1,2 @@
+[2d.layer.global-filter.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini
new file mode 100644
index 00000000000..0c2a17e7e1d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html.ini
@@ -0,0 +1,3 @@
+[2d.layer.layer-rendering-state-reset-in-layer.html]
+  [Tests that layers ignore the global context filter.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js.ini
new file mode 100644
index 00000000000..a90d210ab1e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.layer.layer-rendering-state-reset-in-layer.worker.html]
+  [Tests that layers ignore the global context filter.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.html.ini
new file mode 100644
index 00000000000..b29c600c619
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.basic.html]
+  [reset clears to transparent black]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.worker.js.ini
new file mode 100644
index 00000000000..b4b6a3718c4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.basic.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.basic.worker.html]
+  [reset clears to transparent black]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.html.ini
new file mode 100644
index 00000000000..2da19a2f792
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.state.clip.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.w.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.w.html.ini
new file mode 100644
index 00000000000..07e8cf9140d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.clip.w.html.ini
@@ -0,0 +1,2 @@
+[2d.reset.state.clip.w.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.html.ini
new file mode 100644
index 00000000000..37ba84dede3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.direction.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js.ini
new file mode 100644
index 00000000000..c20b23b6326
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.direction.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.html.ini
new file mode 100644
index 00000000000..6662110b1a1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.fill_style.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js.ini
new file mode 100644
index 00000000000..8eca10b1713
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.fill_style.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.html.ini
new file mode 100644
index 00000000000..fbd0f558364
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.filter.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js.ini
new file mode 100644
index 00000000000..d994de4093f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.filter.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.html.ini
new file mode 100644
index 00000000000..6b0676316f9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.worker.js.ini
new file mode 100644
index 00000000000..98827f2e54d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html.ini
new file mode 100644
index 00000000000..f723ac6322a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_kerning.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js.ini
new file mode 100644
index 00000000000..a29068eb636
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_kerning.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html.ini
new file mode 100644
index 00000000000..c2fd8fa4289
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_stretch.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js.ini
new file mode 100644
index 00000000000..1af3ad94be5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_stretch.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html.ini
new file mode 100644
index 00000000000..75e4d5f04f5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_variant_caps.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js.ini
new file mode 100644
index 00000000000..5717c670464
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.font_variant_caps.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html.ini
new file mode 100644
index 00000000000..b0a26045a70
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.global_alpha.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js.ini
new file mode 100644
index 00000000000..d6592f10045
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.global_alpha.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html.ini
new file mode 100644
index 00000000000..4e4b0805d67
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.global_composite_operation.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js.ini
new file mode 100644
index 00000000000..4aa1b6e58fe
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.global_composite_operation.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html.ini
new file mode 100644
index 00000000000..9dabb7e42b9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.image_smoothing_enabled.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js.ini
new file mode 100644
index 00000000000..1f00f668886
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.image_smoothing_enabled.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html.ini
new file mode 100644
index 00000000000..2d7fe1e484f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.image_smoothing_quality.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js.ini
new file mode 100644
index 00000000000..c27453d1e1a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.image_smoothing_quality.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html.ini
new file mode 100644
index 00000000000..9c811c4999a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.letter_spacing.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js.ini
new file mode 100644
index 00000000000..48105838f95
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.letter_spacing.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.html.ini
new file mode 100644
index 00000000000..b7d527633b6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_cap.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js.ini
new file mode 100644
index 00000000000..fc71eecc2ae
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_cap.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini
new file mode 100644
index 00000000000..61f771ded91
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_dash.html]
+  [check that the line dash is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini
new file mode 100644
index 00000000000..e68cc6f1ea1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_dash.worker.html]
+  [check that the line dash is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini
new file mode 100644
index 00000000000..7a60aa8737e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_dash_offset.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini
new file mode 100644
index 00000000000..a550b617421
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_dash_offset.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.html.ini
new file mode 100644
index 00000000000..b5fae0241c4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_join.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js.ini
new file mode 100644
index 00000000000..ff42f38e7f7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_join.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.html.ini
new file mode 100644
index 00000000000..c6a583dd7a0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_width.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js.ini
new file mode 100644
index 00000000000..b9cb39a9812
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.line_width.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html.ini
new file mode 100644
index 00000000000..e469bc43474
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.miter_limit.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js.ini
new file mode 100644
index 00000000000..f6ade7654a2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.miter_limit.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html.ini
new file mode 100644
index 00000000000..25866c52086
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_blur.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js.ini
new file mode 100644
index 00000000000..2864e8df390
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_blur.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html.ini
new file mode 100644
index 00000000000..6e6e09c8e9d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_color.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js.ini
new file mode 100644
index 00000000000..7fede5ad428
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_color.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html.ini
new file mode 100644
index 00000000000..45f353c74fb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_offset_x.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js.ini
new file mode 100644
index 00000000000..fb59b063ed9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_offset_x.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html.ini
new file mode 100644
index 00000000000..dc33ccfa1a2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_offset_y.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js.ini
new file mode 100644
index 00000000000..c552e3e549c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.shadow_offset_y.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html.ini
new file mode 100644
index 00000000000..6616dd8a847
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.stroke_style.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js.ini
new file mode 100644
index 00000000000..f0730efa41d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.stroke_style.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.html.ini
new file mode 100644
index 00000000000..97eb201d62b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_align.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js.ini
new file mode 100644
index 00000000000..970886e9b8c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_align.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html.ini
new file mode 100644
index 00000000000..7921af65040
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_baseline.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js.ini
new file mode 100644
index 00000000000..5f7c5d32e08
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_baseline.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html.ini
new file mode 100644
index 00000000000..66e19bd1881
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_rendering.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js.ini
new file mode 100644
index 00000000000..60435fffb3a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.text_rendering.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html.ini
new file mode 100644
index 00000000000..1e34d1c435b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.transformation_matrix.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js.ini
new file mode 100644
index 00000000000..1b78cc2c510
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.transformation_matrix.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html.ini
new file mode 100644
index 00000000000..c480eafda05
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.word_spacing.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js.ini
new file mode 100644
index 00000000000..e0ab67740d7
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.reset.state.word_spacing.worker.html]
+  [check that the state is reset]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
new file mode 100644
index 00000000000..89fd3194bc6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps1.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
new file mode 100644
index 00000000000..fa58259ed38
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
new file mode 100644
index 00000000000..553d2bd4171
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps3.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
new file mode 100644
index 00000000000..9c5c9297054
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps4.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
new file mode 100644
index 00000000000..5b3007e7d4e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps5.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
new file mode 100644
index 00000000000..73615053193
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html.ini
@@ -0,0 +1,2 @@
+[2d.text.fontVariantCaps6.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html.ini
new file mode 100644
index 00000000000..3938b9ca77f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.emHeights-low-ascent.html]
+  [Testing emHeights with reduced ascent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js.ini
new file mode 100644
index 00000000000..647723124ed
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.emHeights-low-ascent.worker.html]
+  [Testing emHeights with reduced ascent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html.ini
new file mode 100644
index 00000000000..023860e2233
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.emHeights-zero-descent.html]
+  [Testing emHeights with zero descent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js.ini
new file mode 100644
index 00000000000..afaf97b5071
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.emHeights-zero-descent.worker.html]
+  [Testing emHeights with zero descent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini
new file mode 100644
index 00000000000..18ecde23794
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.fontBoundingBox-reduced-ascent.html]
+  [Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js.ini
new file mode 100644
index 00000000000..2d3bde18d06
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.fontBoundingBox-reduced-ascent.worker.html]
+  [Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini
new file mode 100644
index 00000000000..5182e511a42
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.fontBoundingBox-zero-descent.html]
+  [Testing fontBoundingBox for OffscreenCanvas with zero descent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js.ini
new file mode 100644
index 00000000000..bef70c58148
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.fontBoundingBox-zero-descent.worker.html]
+  [Testing fontBoundingBox for OffscreenCanvas with zero descent metric]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-1.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-1.html.ini
deleted file mode 100644
index f93c680b428..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-1.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-1.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-2.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-2.html.ini
deleted file mode 100644
index ee0519a7ac4..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-2.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-3.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-3.html.ini
deleted file mode 100644
index 2f4e6d4720c..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-3.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-3.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-4.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-4.html.ini
deleted file mode 100644
index 86b24fcf4fb..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-4.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-4.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-5.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-5.html.ini
deleted file mode 100644
index 5c82ce9660a..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-5.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-5.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-6.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-6.html.ini
deleted file mode 100644
index 9eff8d6f55c..00000000000
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/fontVariantCaps-6.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[fontVariantCaps-6.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking-partial.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking-partial.tentative.html.ini
new file mode 100644
index 00000000000..33079ddf70d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking-partial.tentative.html.ini
@@ -0,0 +1,2 @@
+[document-render-blocking-partial.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking.tentative.html.ini
new file mode 100644
index 00000000000..bf425d34f4c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/dom/render-blocking/document-render-blocking.tentative.html.ini
@@ -0,0 +1,2 @@
+[document-render-blocking.tentative.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
new file mode 100644
index 00000000000..1404529e360
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
@@ -0,0 +1,4 @@
+[skip-another-top-level-browsing-context.html]
+  expected: TIMEOUT
+  [Autofocus elements queued in another top-level browsing context's documents should be skipped.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 841bafc6eca..26704422bbe 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/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: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 6f7461b9472..f9138fb999a 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 47b45e65a1c..3cdeb8ebcbc 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,9 +1,3 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html.ini
similarity index 88%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html.ini
index 2a4020ad11a..d10bc885cb7 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html.ini
@@ -1,4 +1,4 @@
-[selectmenu-ask-for-reset.html]
+[selectlist-ask-for-reset.html]
   [ask-for-reset when removing option]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html.ini
new file mode 100644
index 00000000000..b9bd718e824
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-explicit-size.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html.ini
new file mode 100644
index 00000000000..0f5d1c4d775
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-font-size.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-attribute.tentative.html.ini
similarity index 52%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-attribute.tentative.html.ini
index 71b1e100f59..5d642aa7721 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-attribute.tentative.html.ini
@@ -1,42 +1,42 @@
-[selectmenu-form-attribute.tentative.html]
-  [[SELECTMENU\] Basic form association - control with no form attribute is associated with ancestor]
+[selectlist-form-attribute.tentative.html]
+  [[SELECTLIST\] Basic form association - control with no form attribute is associated with ancestor]
     expected: FAIL
 
-  [[SELECTMENU\] Form owner is reset to null when control's form attribute is set to an ID that does not exist in the document]
+  [[SELECTLIST\] Form owner is reset to null when control's form attribute is set to an ID that does not exist in the document]
     expected: FAIL
 
-  [[SELECTMENU\] Control whose form attribute is an empty string has no form owner]
+  [[SELECTLIST\] Control whose form attribute is an empty string has no form owner]
     expected: FAIL
 
-  [[SELECTMENU\] Control whose form attribute is an empty string has no form owner even when form with empty attribute is present]
+  [[SELECTLIST\] Control whose form attribute is an empty string has no form owner even when form with empty attribute is present]
     expected: FAIL
 
-  [[SELECTMENU\] Control's form attribute must be a case sensitive match for the form's id]
+  [[SELECTLIST\] Control's form attribute must be a case sensitive match for the form's id]
     expected: FAIL
 
-  [[SELECTMENU\] Setting the form attribute of a control to the id of a non-ancestor form works]
+  [[SELECTLIST\] Setting the form attribute of a control to the id of a non-ancestor form works]
     expected: FAIL
 
-  [[SELECTMENU\] Removing form id from a control resets the form owner to ancestor]
+  [[SELECTLIST\] Removing form id from a control resets the form owner to ancestor]
     expected: FAIL
 
-  [[SELECTMENU\] Removing the form owner of a control with form attribute resets the form owner to null]
+  [[SELECTLIST\] Removing the form owner of a control with form attribute resets the form owner to null]
     expected: FAIL
 
-  [[SELECTMENU\] Changing form attibute of control resets form owner to correct form]
+  [[SELECTLIST\] Changing form attibute of control resets form owner to correct form]
     expected: FAIL
 
-  [[SELECTMENU\] Moving a control with form attribute within the document does not change the form owner]
+  [[SELECTLIST\] Moving a control with form attribute within the document does not change the form owner]
     expected: FAIL
 
-  [[SELECTMENU\] When the id of a non-ancestor form changes from not being a match for the form attribute to being a match, the control's form owner is reset]
+  [[SELECTLIST\] When the id of a non-ancestor form changes from not being a match for the form attribute to being a match, the control's form owner is reset]
     expected: FAIL
 
-  [[SELECTMENU\] When form element with same ID as the control's form attribute is inserted earlier in tree order, the form owner is changed to the inserted form]
+  [[SELECTLIST\] When form element with same ID as the control's form attribute is inserted earlier in tree order, the form owner is changed to the inserted form]
     expected: FAIL
 
-  [[SELECTMENU\] When non-form element with same ID as the control's form attribute is inserted earlier in tree order, the control does not have a form owner]
+  [[SELECTLIST\] When non-form element with same ID as the control's form attribute is inserted earlier in tree order, the control does not have a form owner]
     expected: FAIL
 
-  [[SELECTMENU\] A control that is not in the document but has the form attribute set is associated with the nearest ancestor form if one exists]
+  [[SELECTLIST\] A control that is not in the document but has the form attribute set is associated with the nearest ancestor form if one exists]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-state-restore.tentative.html.ini
similarity index 58%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-state-restore.tentative.html.ini
index 0915c8addad..81cd0e54d89 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-state-restore.tentative.html.ini
@@ -1,3 +1,3 @@
-[selectmenu-form-state-restore.tentative.html]
+[selectlist-form-state-restore.tentative.html]
   [Test restoring state after form submission]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html.ini
new file mode 100644
index 00000000000..9185ce3ad71
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html.ini
@@ -0,0 +1,6 @@
+[selectlist-form-submission.tentative.html]
+  [Test that HTMLSelectList.value is used for form submission]
+    expected: FAIL
+
+  [Test that HTMLSelectList.value is not used for form submission without name attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html.ini
new file mode 100644
index 00000000000..8cf8693ba75
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html.ini
@@ -0,0 +1,3 @@
+[selectlist-labels.tentative.html]
+  [Validate selectlist.labels]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html.ini
new file mode 100644
index 00000000000..c142dbecd58
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-marker-part.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html.ini
new file mode 100644
index 00000000000..3b5e8db08d8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-marker-slot.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html.ini
new file mode 100644
index 00000000000..83afdb3d551
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-option-arbitrary-content-displayed.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html.ini
new file mode 100644
index 00000000000..a72ab444eb8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-option-arbitrary-content-not-displayed.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html.ini
new file mode 100644
index 00000000000..0cc1d2ef060
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html.ini
@@ -0,0 +1,6 @@
+[selectlist-pseudo-open-closed.tentative.html]
+  [Selectlist should support :open and :closed pseudo selectors.]
+    expected: FAIL
+
+  [Selectlist :open and :closed should invalidate correctly.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-required-attribute.tentative.html.ini
similarity index 50%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-required-attribute.tentative.html.ini
index 16cf2b2a871..ac38b919084 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-required-attribute.tentative.html.ini
@@ -1,3 +1,3 @@
-[selectmenu-required-attribute.tentative.html]
+[selectlist-required-attribute.tentative.html]
   [Test required attribute]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html.ini
new file mode 100644
index 00000000000..7c4cb1d303d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-rtl.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html.ini
new file mode 100644
index 00000000000..11aa22b4344
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-selected-value-behavior.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html.ini
new file mode 100644
index 00000000000..1290d61591c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-selected-value-part.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html.ini
new file mode 100644
index 00000000000..7c99a7ac703
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-selected-value-slot.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html.ini
similarity index 59%
rename from tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html.ini
index cad005a84ed..cc3a382057d 100644
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html.ini
@@ -1,12 +1,12 @@
-[selectmenu-user-select.tentative.html]
+[selectlist-user-select.tentative.html]
   [Option elements should have user-select:none without slotting buttons or listboxes.]
     expected: FAIL
 
   [Slotted in buttons and listboxes should have user-select:none.]
     expected: FAIL
 
-  [Setting user-select:auto on selectmenus should re-enable selection.]
+  [Setting user-select:auto on selectlists should re-enable selection.]
     expected: FAIL
 
-  [Children of selectmenu should be able to opt-in to user-select.]
+  [Children of selectlist should be able to opt-in to user-select.]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html.ini
new file mode 100644
index 00000000000..ab15414ac32
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html.ini
@@ -0,0 +1,6 @@
+[selectlist-validity.tentative.html]
+  [Validation for placeholder option]
+    expected: FAIL
+
+  [Check form not submitted for invalid selectlist]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html.ini
new file mode 100644
index 00000000000..ef69d0b5cbd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html.ini
@@ -0,0 +1,3 @@
+[selectlist-value-option.tentative.html]
+  [selectlist.value should reflect option.value]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html.ini
similarity index 74%
rename from tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini
rename to tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html.ini
index c14c5aa877d..5a95749e002 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html.ini
@@ -1,17 +1,23 @@
-[selectmenu-value-selectedOption.tentative.html]
-  [Test that HTMLSelectMenu with no options has empty string for value and null for selectedOption]
+[selectlist-value-selectedOption.tentative.html]
+  [Test that HTMLSelectList with no options has empty string for value and null for selectedOption]
     expected: FAIL
 
   [Test value and selectedOption with HTMLOptionElement element option parts]
     expected: FAIL
 
+  [Test value and selectedOption when value is null]
+    expected: FAIL
+
+  [Test value and selectedOption when value is undefined]
+    expected: FAIL
+
   [Test value with non-HTMLOptionElement elements labeled as parts]
     expected: FAIL
 
   [Test that value and selectedOption are updated when options are removed]
     expected: FAIL
 
-  [Test that slotted-in selected-value part is updated to value of selectmenu]
+  [Test that slotted-in selected-value part is updated to value of selectlist]
     expected: FAIL
 
   [Test that option parts in a slotted-in listbox are reflected in the value property]
@@ -20,14 +26,8 @@
   [Test that value and selectedOption are correctly updated]
     expected: FAIL
 
-  [Test that HTMLOption.selected updates selectmenu.value and selectmenu.selectedOption]
+  [Test that HTMLOption.selected updates selectlist.value and selectlist.selectedOption]
     expected: FAIL
 
-  [Test that HTMLOption.value updates selectmenu.value]
-    expected: FAIL
-
-  [Test value and selectedOption when value is null]
-    expected: FAIL
-
-  [Test value and selectedOption when value is undefined]
+  [Test that HTMLOption.value updates selectlist.value]
     expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html.ini
new file mode 100644
index 00000000000..0ebf079856f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-writingmode-lr.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html.ini
new file mode 100644
index 00000000000..f2437ff1aae
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html.ini
@@ -0,0 +1,2 @@
+[selectlist-writingmode-rl.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html.ini
deleted file mode 100644
index df4bebcfec0..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-explicit-size.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html.ini
deleted file mode 100644
index 0f6aac9342b..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-font-size.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini
deleted file mode 100644
index 8118ccaedb4..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[selectmenu-form-submission.tentative.html]
-  [Test that HTMLSelectMenu.value is used for form submission]
-    expected: FAIL
-
-  [Test that HTMLSelectMenu.value is not used for form submission without name attribute]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini
deleted file mode 100644
index 0105e74004d..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selectmenu-labels.tentative.html]
-  [Validate selectmenu.labels]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html.ini
deleted file mode 100644
index 1296af3eb70..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-marker-part.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html.ini
deleted file mode 100644
index 46aeed63957..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-marker-slot.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini
deleted file mode 100644
index 639f36162aa..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-option-arbitrary-content-displayed.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini
deleted file mode 100644
index 58fdfdacab4..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-option-arbitrary-content-not-displayed.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini
deleted file mode 100644
index 20d7563d7a1..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[selectmenu-pseudo-open-closed.tentative.html]
-  [Selectmenu should support :open and :closed pseudo selectors.]
-    expected: FAIL
-
-  [Selectmenu :open and :closed should invalidate correctly.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html.ini
deleted file mode 100644
index 63e50dff351..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-rtl.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html.ini
deleted file mode 100644
index 7750dac7ac9..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-selected-value-behavior.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html.ini
deleted file mode 100644
index 3af9364a90b..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-selected-value-part.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html.ini
deleted file mode 100644
index fa294a27110..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-selected-value-slot.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini
deleted file mode 100644
index cad005a84ed..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[selectmenu-user-select.tentative.html]
-  [Option elements should have user-select:none without slotting buttons or listboxes.]
-    expected: FAIL
-
-  [Slotted in buttons and listboxes should have user-select:none.]
-    expected: FAIL
-
-  [Setting user-select:auto on selectmenus should re-enable selection.]
-    expected: FAIL
-
-  [Children of selectmenu should be able to opt-in to user-select.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini
deleted file mode 100644
index f0b90e82c56..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[selectmenu-validity.tentative.html]
-  [Validation for placeholder option]
-    expected: FAIL
-
-  [Check form not submitted for invalid selectmenu]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini
deleted file mode 100644
index 693bd4e2994..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selectmenu-value-option.tentative.html]
-  [selectmenu.value should reflect option.value]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini
deleted file mode 100644
index c571a62dbd7..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-writingmode-lr.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini
deleted file mode 100644
index 4359e0d6770..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-writingmode-rl.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/tabular-data/the-table-element/caption-methods.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/tabular-data/the-table-element/caption-methods.html.ini
index d6332eb9b05..05c24ded555 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/tabular-data/the-table-element/caption-methods.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/tabular-data/the-table-element/caption-methods.html.ini
@@ -1,6 +1,4 @@
 [caption-methods.html]
   type: testharness
-  expected: CRASH
   [Creating and deleting captions]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
new file mode 100644
index 00000000000..b8bdf33cb65
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/syntax/parsing/DOMContentLoaded-defer.html.ini
@@ -0,0 +1,3 @@
+[DOMContentLoaded-defer.html]
+  [The end: DOMContentLoaded and defer scripts]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 8845054116d..e55f8f2ce3c 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,3 +3,6 @@
   expected: TIMEOUT
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
+
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
index dbe1def99e3..7237f5792de 100644
--- a/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,9 +1,10 @@
 [promise-job-entry-different-function-realm.html]
+  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Thenable resolution]
     expected: FAIL
@@ -12,4 +13,4 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/webmessaging/with-ports/018.html.ini b/tests/wpt/meta-legacy-layout/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..b7b36c1d3a4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,4 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini b/tests/wpt/meta-legacy-layout/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
new file mode 100644
index 00000000000..aa6c9e5b826
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
@@ -0,0 +1,4 @@
+[localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html]
+  expected: TIMEOUT
+  [StorageKey: test 3P about:blank window opened from a 3P iframe]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index ed75eca8bb5..833b804569b 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -141,7 +141,7 @@
       ]
      ],
      "displaylocked-serialize.html": [
-      "76784291b441566da93071ed92b959829a59c846",
+      "04be6ddf71a7f70c6dbd1610df236a118e316374",
       [
        null,
        {}
@@ -2429,6 +2429,13 @@
         {}
        ]
       ],
+      "floated-input-in-inline-next-column.html": [
+       "1b84cd3d99a723e33301f87db3a3933ac33c8cf2",
+       [
+        null,
+        {}
+       ]
+      ],
       "forced-break-in-oof-in-column-balancing-nested.html": [
        "02b3295444aed8cd00fbedd14b648b86b87c5f77",
        [
@@ -3206,7 +3213,16 @@
        null,
        {}
       ]
-     ]
+     ],
+     "sticky": {
+      "position-sticky-details-crash.html": [
+       "65b7ea488070d4631fe602a8cd55a2e87776cef9",
+       [
+        null,
+        {}
+       ]
+      ]
+     }
     },
     "css-properties-values-api": {
      "at-property-non-matching-media-crash.html": [
@@ -4126,6 +4142,15 @@
       ]
      ]
     },
+    "css-will-change": {
+     "will-change-contents-crash.html": [
+      "b2a05dac869a0e365ef668b2ed9c83ac98c98b89",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-writing-modes": {
      "bidi-inline-fragment-crash.html": [
       "5d3796566b9c68abdc0defb016c1675d1ea8c9d0",
@@ -4327,6 +4352,13 @@
        null,
        {}
       ]
+     ],
+     "offset-path-url-crash.html": [
+      "c6fe6319113b6325771bfdcc15c59a33f816814e",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "printing": {
@@ -4355,6 +4387,13 @@
        {}
       ]
      ],
+     "has-sibling-chrome-crash.html": [
+      "0306e3e39272c321fc3539aa582b4e239ffe2fa1",
+      [
+       null,
+       {}
+      ]
+     ],
      "invalidation": {
       "crashtests": {
        "nth-child-of-attribute-crash.html": [
@@ -5490,6 +5529,15 @@
         ]
        ]
       },
+      "the-embed-element": {
+       "embed-named-attribute-detached-context-crash.html": [
+        "7445b49f0fec0c432cadd9e829c63be2436b25ce",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "the-iframe-element": {
        "hittest-detached-iframe-crash.html": [
         "70fe8c11262111933e80af5393cd34d81bd1e670",
@@ -5664,9 +5712,9 @@
         ]
        ]
       },
-      "the-selectmenu-element": {
-       "selectmenu-listbox-fallback-change-crash.tentative.html": [
-        "690a98dcf3219e505d054d7ed5bc4c312fbbea4c",
+      "the-selectlist-element": {
+       "selectlist-listbox-fallback-change-crash.tentative.html": [
+        "1a9e81d8178a24f834d2e8ae7d86b60eb5ea4ad0",
         [
          null,
          {}
@@ -6667,6 +6715,15 @@
        {}
       ]
      ]
+    },
+    "view-timelines": {
+     "subject-br-crash.html": [
+      "36627dbea6386b147d77ef6910fd132090eec8eb",
+      [
+       null,
+       {}
+      ]
+     ]
     }
    },
    "selection": {
@@ -160848,6 +160905,19 @@
         {}
        ]
       ],
+      "content-visibility-085.html": [
+       "2148d89317f581e28cf7cbc5669ac6d0f3c5ce8f",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "content-visibility-auto-in-iframe.html": [
        "ba02cac6684d2c283de114c0b00fcd4e6f99f724",
        [
@@ -181666,6 +181736,19 @@
        {}
       ]
      ],
+     "font-size-adjust-reload.html": [
+      "37d79a68bd80961f306476707dbdf35d5a5f4da4",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/font-size-adjust-reload-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "font-size-adjust-units-001.html": [
       "4e27ef1116ed7ba48fb5fbc38b49c315eeeef71c",
       [
@@ -195329,6 +195412,19 @@
       ]
      ],
      "image-set": {
+      "image-set-all-options-invalid.html": [
+       "14d3d0b6e551642dc42afef68cb954929cae9ad9",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "image-set-calc-x-rendering-2.html": [
        "b7c02fce25d45b9b0be8f673bc144a8b4a698450",
        [
@@ -208123,19 +208219,6 @@
         {}
        ]
       ],
-      "mask-origin-2.html": [
-       "90ee89b15df46a17f6d0d315a26de09a10098fc5",
-       [
-        null,
-        [
-         [
-          "/css/css-masking/mask-image/mask-origin-2-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
       "mask-origin-3.html": [
        "eade316b3d8185685b24be04a24735a23f5bfba3",
        [
@@ -251401,6 +251484,32 @@
          ],
          {}
         ]
+       ],
+       "word-break-auto-phrase-wbr-nobr-001.html": [
+        "76944730d5c27cc2e709715c0819d4b2a4d0066f",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "word-break-auto-phrase-wbr-nobr-002.html": [
+        "9b4e55623c5b5fc89ec973ce72376e949a30c70d",
+        [
+         null,
+         [
+          [
+           "/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
        ]
       },
       "break-boundary-2-chars-001.html": [
@@ -259938,7 +260047,7 @@
       ]
      ],
      "preserve3d-pseudo-element.html": [
-      "f3a4441e991ad57fb1459c1ebb0a9b3a810620a1",
+      "a84482e5ecd549d57f0cca49dcd0bdde5f622eff",
       [
        null,
        [
@@ -261427,7 +261536,7 @@
         {}
        ]
       ],
-      "cssbox-content-box.html": [
+      "cssbox-content-box-001.html": [
        "31a44282930b71e5483fa0dc9774c99843b0fd93",
        [
         null,
@@ -261440,6 +261549,19 @@
         {}
        ]
       ],
+      "cssbox-content-box-002.html": [
+       "24e038b562d12df45416344b83e21596806204c0",
+       [
+        null,
+        [
+         [
+          "/css/css-transforms/transform-box/reference/cssbox-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "cssbox-fill-box.html": [
        "6821140bfead737f01fd227fd57fc029b385502e",
        [
@@ -283688,13 +283810,26 @@
        {}
       ]
      ],
-     "wide-keyword-fallback.html": [
-      "bb27a61e610eb0ea58f4e644919ef595db5e0a9d",
+     "wide-keyword-fallback-001.html": [
+      "947c253837c059f66042964ed7c263520667b4b1",
       [
        null,
        [
         [
-         "/css/css-variables/wide-keyword-fallback-ref.html",
+         "/css/css-variables/wide-keyword-fallback-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "wide-keyword-fallback-002.html": [
+      "315468a75ec040c23e8bfeeea061f7c25ce15441",
+      [
+       null,
+       [
+        [
+         "/css/css-variables/wide-keyword-fallback-002-ref.html",
          "=="
         ]
        ],
@@ -306484,7 +306619,7 @@
       ]
      ],
      "offset-path-shape-ellipse-003.html": [
-      "38ef5eb9bbfa9c955c2d4fd53440ab2d21c8a26e",
+      "1831af7019d18eb0450b79000a13c19c3ae8b0dd",
       [
        null,
        [
@@ -306504,7 +306639,7 @@
            ],
            [
             0,
-            450
+            473
            ]
           ]
          ]
@@ -306803,13 +306938,175 @@
        {}
       ]
      ],
-     "offset-path-url.html": [
-      "b8cd89104fbc2d1a3b741732a902a7f94957a103",
+     "offset-path-url-001.html": [
+      "0c7ac4f1019b3bad85f565c2851ef8ed7c187860",
       [
        null,
        [
         [
-         "/css/motion/offset-path-url-ref.html",
+         "/css/motion/offset-path-url-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-002.html": [
+      "7957d785a3ff9f74e90a6ceba231a424d54ca2c7",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-003.html": [
+      "4485b52d071f15b9b9f812af0fe5f56a30cd0494",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-003-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            35
+           ],
+           [
+            0,
+            76
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "offset-path-url-004.html": [
+      "05aea375a18018eac9e0797f2cbdc1c3dae8963d",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-004-ref.html",
+         "=="
+        ]
+       ],
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            15
+           ],
+           [
+            0,
+            65
+           ]
+          ]
+         ]
+        ]
+       }
+      ]
+     ],
+     "offset-path-url-005.html": [
+      "437a111a7eab49821e1cc07b0d65fb1bf8971324",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-006.html": [
+      "b65af774bb7eefafafffd8799d8daeb4476c1bcd",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-007.html": [
+      "0f80207c0e3c491a242ad43993a4edc108568756",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-008.html": [
+      "48b99006f94289179cb2ddd6c5af044ad721e09d",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-008-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-009.html": [
+      "90a13d18f4ba99d7746817ccdf2e58051c4ef511",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-008-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-010.html": [
+      "d29077045978ea09c8902af24f507365a86a27f1",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-008-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "offset-path-url-011.html": [
+      "84dfe5205bac5a388f87cc83e1d0d4e40324f158",
+      [
+       null,
+       [
+        [
+         "/css/motion/offset-path-url-011-ref.html",
          "=="
         ]
        ],
@@ -311909,6 +312206,19 @@
          {}
         ]
        ],
+       "2d.layer.global-filter.html": [
+        "cf46f41b974947839f6f69e028b6dc51ba4ec62d",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/layers/2d.layer.global-filter-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.global-states.alpha.blending.html": [
         "8e15a2b936417297761da7150e64d6ede9c4f8c6",
         [
@@ -311923,7 +312233,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.blending.shadow.html": [
-        "22946174cdeac849a545dad2d1b44f0a7640a0e0",
+        "c8c6d433bc0c63d41c831c7a4708155cd6270ed4",
         [
          null,
          [
@@ -311949,7 +312259,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.composite.shadow.html": [
-        "c07e717a663ba67b0c9e37f4989ec050c9350d6b",
+        "92b8a0d7a75c8ed7f292392fa3b0a0a71ec86464",
         [
          null,
          [
@@ -311975,7 +312285,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.shadow.html": [
-        "bcb7fe5096297ebccd6254845b4ac0524997bf11",
+        "a325302b3b0705a1758252c181dba6f671e6dedc",
         [
          null,
          [
@@ -312001,7 +312311,7 @@
         ]
        ],
        "2d.layer.global-states.blending.shadow.html": [
-        "80f414d4ee5e6ab5853fed1f94fdcd0f6c29146a",
+        "51926d76d8ca888713e5a73b6c8161032e85391a",
         [
          null,
          [
@@ -312027,7 +312337,7 @@
         ]
        ],
        "2d.layer.global-states.composite.shadow.html": [
-        "9e32dddd40da4cd4361838bea19a29ea2550d90b",
+        "c563a57b76ec704d953d4c7d0f1d6af610d976d1",
         [
          null,
          [
@@ -312053,7 +312363,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow.html": [
-        "ae320702c2f6dc01caaf08c2b7333b13cf913e62",
+        "ccadfb624b727d5706e60eea1bd81b8c2194fd0c",
         [
          null,
          [
@@ -312079,7 +312389,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow.html": [
-        "050bb5f0e3654976ae145f4c63bf5e3417243bda",
+        "b2907f02aa57551ceace61a4189d1e2dbaee0e21",
         [
          null,
          [
@@ -312105,7 +312415,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.shadow.html": [
-        "97595444db710c3598daee9cc3a56076be6aa93c",
+        "6aa8e75a9507e60d4bf922cd300aafc472996037",
         [
          null,
          [
@@ -312131,7 +312441,7 @@
         ]
        ],
        "2d.layer.global-states.filter.blending.shadow.html": [
-        "491bdb377b98c635a0ef4e997cd6c4682b90e58d",
+        "e54cf06d0dd301f034724d9688b2723ecc0dcd8a",
         [
          null,
          [
@@ -312157,7 +312467,7 @@
         ]
        ],
        "2d.layer.global-states.filter.composite.shadow.html": [
-        "ce9215eeb1cbe1e342e6d6cf79f5b3bfc92af96c",
+        "e5c76986347ae7fc3473fb9e7b0edb27b6efb82e",
         [
          null,
          [
@@ -312183,7 +312493,7 @@
         ]
        ],
        "2d.layer.global-states.filter.shadow.html": [
-        "f7fc309cc0aefbbc82bcf90af0d2865e455d975c",
+        "9efcd9d4f753c8a8c7dbadd086c858cf5232b616",
         [
          null,
          [
@@ -312209,7 +312519,7 @@
         ]
        ],
        "2d.layer.global-states.shadow.html": [
-        "bd9e868d1ef0f8e93060bc2601b3f1dbd6ac4566",
+        "209316164cb2cd8e38cc47507ca2a2083f20a17a",
         [
          null,
          [
@@ -312326,7 +312636,7 @@
         ]
        ],
        "2d.layer.reset.html": [
-        "dc50ee76c10bf4cb960aacbb6a74e3bd3bdcfef8",
+        "9ad779abfddabe221d600b4cc48f69954ee1aa4f",
         [
          null,
          [
@@ -312368,7 +312678,7 @@
         ]
        ],
        "2d.layer.several-complex.html": [
-        "6ae78f690aeaac3b57502a91c56420e01232eaa8",
+        "cff0c123ef64d2f8d6508b9d48511b27060ca054",
         [
          null,
          [
@@ -313417,7 +313727,100 @@
         ]
        ]
       },
+      "reset": {
+       "2d.reset.state.clip.html": [
+        "ab3fa1081ca9be4e21fc751fd44e1b69324d4318",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/reset/2d.reset.state.clip-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ]
+      },
       "text": {
+       "2d.text.fontVariantCaps1.html": [
+        "b610c2240ffe96c7fe747a0db55c5bda51802e38",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps2.html": [
+        "f9d42ac3a60eb9f2a62ea2343c9f17a450713b71",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html",
+           "!="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps3.html": [
+        "a90e0c29b3dd1aa0176dabb653cd36d07abfadf4",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps4.html": [
+        "b598fb60baf2d5126571eb020306cc57fd603464",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps5.html": [
+        "b871f7c062409ffc0b263594c495bc0d5bde3896",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps6.html": [
+        "e7bbd29341dcc6755848672047c3263cf4196fdd",
+        [
+         null,
+         [
+          [
+           "/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "direction-inherit-rtl.html": [
         "0ad92181a06acfdd4ca1d553b5fc7dfa4970f001",
         [
@@ -313456,84 +313859,6 @@
          ],
          {}
         ]
-       ],
-       "fontVariantCaps-1.html": [
-        "3240476ad0f03e9a1b3f37a242fe781b2a46d613",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/reference/fontVariantCaps-1-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-2.html": [
-        "cbcb73b231ce9051cb1386e366a241dc980bc05c",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/reference/fontVariantCaps-2-ref.html",
-           "!="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-3.html": [
-        "8c0761121efb0bfbdda0871d7d735ceeb5105cd3",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/reference/fontVariantCaps-3-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-4.html": [
-        "62fe241838b2a9ab5d1656a4165266232fb4ec0d",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/reference/fontVariantCaps-3-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-5.html": [
-        "a21169f8bb64781ca5235cfedcde562a3c8f85e3",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/reference/fontVariantCaps-1-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-6.html": [
-        "6126c4e7b2f3ebf17e1fa8e79947750be1728beb",
-        [
-         null,
-         [
-          [
-           "/html/canvas/element/text/reference/fontVariantCaps-2-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
        ]
       }
      },
@@ -313593,6 +313918,32 @@
          {}
         ]
        ],
+       "2d.layer.global-filter.html": [
+        "2388a06a964222700dd1f71b57ad0b7004becfbb",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.layer.global-filter.w.html": [
+        "4c8f92d18a1d149185ae86a5e9d6c3ad7dd16aa5",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "2d.layer.global-states.alpha.blending.html": [
         "71414b4b3790b97ad4947418c4ab9b1b04abcb57",
         [
@@ -313607,7 +313958,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.blending.shadow.html": [
-        "551df36b15e450b2dee9a11b1933b7498aee7601",
+        "ed2d2d70af2cf5083a7ae72657605d3e99ef0afe",
         [
          null,
          [
@@ -313620,7 +313971,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.blending.shadow.w.html": [
-        "6851a4a8468c83939879849ab99484f7603d0222",
+        "1ff3ad838505496370aa41c5e9c935300ed73b61",
         [
          null,
          [
@@ -313659,7 +314010,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.composite.shadow.html": [
-        "841742ef1e7fcbd796952d1888d6654db7f543ab",
+        "eb579cdcce72a5236a9e095aac37c9658e740949",
         [
          null,
          [
@@ -313672,7 +314023,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.composite.shadow.w.html": [
-        "ef44257c0ad3d57efbe222badd43cc3142115fb0",
+        "60e36f4b9786c6eff4bf53b16c1aa8e3350b468d",
         [
          null,
          [
@@ -313711,7 +314062,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.shadow.html": [
-        "daa788cd1505083bfcb5e9a2d7b38df84092758b",
+        "65a66c977d5d8aa2716e97405d78e7a9e1b90106",
         [
          null,
          [
@@ -313724,7 +314075,7 @@
         ]
        ],
        "2d.layer.global-states.alpha.shadow.w.html": [
-        "f75db3d249068e56a1f44287dee5cbc592a40bba",
+        "f404601e3d15392c5919fb5b49ac4e267fadf60f",
         [
          null,
          [
@@ -313763,7 +314114,7 @@
         ]
        ],
        "2d.layer.global-states.blending.shadow.html": [
-        "9ad87aa0cd2bf7822fbcbda30b26db279bf33a06",
+        "2e91f3d2d108c7397e623b2170a4f4cfc0a210d6",
         [
          null,
          [
@@ -313776,7 +314127,7 @@
         ]
        ],
        "2d.layer.global-states.blending.shadow.w.html": [
-        "dc52e9e9251329199814103d18923c659c59265f",
+        "d8e20d0479542b14e49652f6f3e2be2416be346c",
         [
          null,
          [
@@ -313815,7 +314166,7 @@
         ]
        ],
        "2d.layer.global-states.composite.shadow.html": [
-        "2e0883f5af81035a80d24ae4ed471ee7f5717051",
+        "1e3ab4d6a0764bbd73e3bb62d3c08d75960f0c92",
         [
          null,
          [
@@ -313828,7 +314179,7 @@
         ]
        ],
        "2d.layer.global-states.composite.shadow.w.html": [
-        "66d44050581365e7a23943101a2cf55adaf85dfe",
+        "7dfb70148b56fdd4c6006892b3ef593d9dced9a3",
         [
          null,
          [
@@ -313867,7 +314218,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow.html": [
-        "fd6022c85d27016ba023929fdd15447607d8f3e7",
+        "62d98d967c83a2085837f8fb8cda8c81b9fbd7ec",
         [
          null,
          [
@@ -313880,7 +314231,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow.w.html": [
-        "00237ef3fb1fb05e3a1dc4c50e17648109f2a2b4",
+        "e81efd6b8de3ee6a228333c2987ef1e12e774666",
         [
          null,
          [
@@ -313919,7 +314270,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow.html": [
-        "069e5ccf98695a42532ba9d8650ba68d9bf15518",
+        "d067ff2f5e4caecdedbea9abb1626008575dc9a1",
         [
          null,
          [
@@ -313932,7 +314283,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow.w.html": [
-        "f58292428159dcd47fd3cd7135d130c88644863b",
+        "39abc78b17de4eb5c3b396549a40c520530dd721",
         [
          null,
          [
@@ -313971,7 +314322,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.shadow.html": [
-        "aaa2e1cfb1ef8cbb8e6571844b844f4259cbf0a3",
+        "2548c211810ced1086c0b670847c649f0499ede5",
         [
          null,
          [
@@ -313984,7 +314335,7 @@
         ]
        ],
        "2d.layer.global-states.filter.alpha.shadow.w.html": [
-        "ff211ec7beb7337385b030f303a3c45beb799e28",
+        "5e1494422ee0e9aa7f5bb7cae7f8a9401fe20eb7",
         [
          null,
          [
@@ -314023,7 +314374,7 @@
         ]
        ],
        "2d.layer.global-states.filter.blending.shadow.html": [
-        "57fbca6d3b7b3caafce1db06643f22051c792b91",
+        "d0d429bee333ef86887b601e4beff84da8aa72ae",
         [
          null,
          [
@@ -314036,7 +314387,7 @@
         ]
        ],
        "2d.layer.global-states.filter.blending.shadow.w.html": [
-        "674c177bc8fdc34953a122579ed903c3715b672d",
+        "ce432ea74d9f051c47be8881b9efc5be22b1e599",
         [
          null,
          [
@@ -314075,7 +314426,7 @@
         ]
        ],
        "2d.layer.global-states.filter.composite.shadow.html": [
-        "0cc84d92cbddc4dda4568e89eb8bc8cc7ec3755a",
+        "b5e8b9f843a1d1cfd488181536263f8063062fa8",
         [
          null,
          [
@@ -314088,7 +314439,7 @@
         ]
        ],
        "2d.layer.global-states.filter.composite.shadow.w.html": [
-        "cddcc3cdd7d23f6038682a81c44d70fec7ca1f26",
+        "894089d88e43bb3b7e71f14465688a2d8e58bf48",
         [
          null,
          [
@@ -314140,7 +314491,7 @@
         ]
        ],
        "2d.layer.global-states.filter.shadow.html": [
-        "5780181a3f28bf9169b45934fd147caabb3c34e0",
+        "7bb0ef5e134cced998f81a9dbc6bb3c75c60cb00",
         [
          null,
          [
@@ -314153,7 +314504,7 @@
         ]
        ],
        "2d.layer.global-states.filter.shadow.w.html": [
-        "99ea29b5dc503d7c1f1775e26c4d79db0a3af1c2",
+        "bc9bd48aad3d81ddedc82427c1e00c6d39f33cd8",
         [
          null,
          [
@@ -314192,7 +314543,7 @@
         ]
        ],
        "2d.layer.global-states.shadow.html": [
-        "41a832c516e6bb7ff03dd7d802c6965c9ad41ca5",
+        "ad60e87fb13e9a64e8b0b269ebdf8c337bdb0bfd",
         [
          null,
          [
@@ -314205,7 +314556,7 @@
         ]
        ],
        "2d.layer.global-states.shadow.w.html": [
-        "7b78f4b739ad8644a7082367bf67b673c951a1c1",
+        "1fc35fd33aa6dc98ae6d78c329879702db18d096",
         [
          null,
          [
@@ -314400,7 +314751,7 @@
         ]
        ],
        "2d.layer.reset.html": [
-        "4b2fe6229fea77fe4c0ffc6c14a2bf379170909a",
+        "3254c0a0489094feee414f868bdd59da81e11729",
         [
          null,
          [
@@ -314413,7 +314764,7 @@
         ]
        ],
        "2d.layer.reset.w.html": [
-        "710e56bf46b78e8fa9d90e178b77f6f61f25cd51",
+        "09bd6451bd00884dc837b830b275204fd81fc044",
         [
          null,
          [
@@ -314484,7 +314835,7 @@
         ]
        ],
        "2d.layer.several-complex.html": [
-        "c4b50282805374bbee713ae7b9506eccc7d39cce",
+        "e30f1d2fa0eebc2983c8478f7c0e3eb970e40057",
         [
          null,
          [
@@ -314513,7 +314864,7 @@
         ]
        ],
        "2d.layer.several-complex.w.html": [
-        "114c5e06868141114c22f830a12fa31673eb5d0a",
+        "e00de63507248deaaf435ba76b158ba7d59d5011",
         [
          null,
          [
@@ -314594,7 +314945,113 @@
         ]
        ]
       },
+      "reset": {
+       "2d.reset.state.clip.html": [
+        "2f53da7a496c57a7148a0d252bcdf7788095ca06",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.state.clip-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.reset.state.clip.w.html": [
+        "ec4bdf5b23f2956e38d4e6aca30181cb95a3d70b",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/reset/2d.reset.state.clip-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ]
+      },
       "text": {
+       "2d.text.fontVariantCaps1.html": [
+        "a2da7f557ce7c10d4b4dac0d9cd351fe11c062f1",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps2.html": [
+        "8a644fbb616bc42d223093b70a54fb6653c6b6d4",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps2-unexpected.html",
+           "!="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps3.html": [
+        "665a176087fba458e1b7708486d869ebd6862ce1",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps4.html": [
+        "84c5fbb4469f1ce6c844850dce34f79dbee62870",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps5.html": [
+        "877d890ccc6d114fb70fa3df850366bd9a5bbe14",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "2d.text.fontVariantCaps6.html": [
+        "08c70a3a2e2fd0b60020a21877575d10108a06c0",
+        [
+         null,
+         [
+          [
+           "/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "canvas.2d.fontStretch.condensed.html": [
         "0cbd5e3c1f18935d04a18359caa8c91c89fd1806",
         [
@@ -314711,84 +315168,6 @@
          ],
          {}
         ]
-       ],
-       "fontVariantCaps-1.html": [
-        "aed6f6603846d1e56e3eab775c72789102fe9f51",
-        [
-         null,
-         [
-          [
-           "/html/canvas/offscreen/text/reference/fontVariantCaps-1-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-2.html": [
-        "7d8fc08cfe694a287ad5782ecddf6f297389f746",
-        [
-         null,
-         [
-          [
-           "/html/canvas/offscreen/text/reference/fontVariantCaps-2-ref.html",
-           "!="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-3.html": [
-        "8e9ddd464a0b4493e130255e9977c93d32a45129",
-        [
-         null,
-         [
-          [
-           "/html/canvas/offscreen/text/reference/fontVariantCaps-3-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-4.html": [
-        "d2f4439897d30f2810afaed39156232a14d8caa7",
-        [
-         null,
-         [
-          [
-           "/html/canvas/offscreen/text/reference/fontVariantCaps-3-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-5.html": [
-        "57b6ca70776863d7f8fea40f0627582069e9ead4",
-        [
-         null,
-         [
-          [
-           "/html/canvas/offscreen/text/reference/fontVariantCaps-1-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
-       "fontVariantCaps-6.html": [
-        "09ff6fab0c608935a37785f3be3ef72b05645f2c",
-        [
-         null,
-         [
-          [
-           "/html/canvas/offscreen/text/reference/fontVariantCaps-2-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
        ]
       }
      }
@@ -320113,196 +320492,196 @@
         ]
        ]
       },
-      "the-selectmenu-element": {
-       "selectmenu-explicit-size.tentative.html": [
-        "8c09f6c88964d5e72c54539a6fa1338043023e33",
+      "the-selectlist-element": {
+       "selectlist-explicit-size.tentative.html": [
+        "d9e52a9fff74ab91b6a33cc10d70a7055a54e48e",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-font-size.tentative.html": [
-        "4a4d129cb94e5518f8b08c616184797312ed70af",
+       "selectlist-font-size.tentative.html": [
+        "9c30e71bda38ea344419de4e087be5b651a38989",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-font-size-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-font-size-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-marker-end-aligned.tentative.html": [
-        "a419108e3d2fdd93a1e1d1508a0aa3311fda3a8a",
+       "selectlist-marker-end-aligned.tentative.html": [
+        "c2540acb368c7b945f13b454d1190c8780c27a48",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-marker-part.tentative.html": [
-        "b6e94c947a42730b99c33d6cf2b3b5cf77b601ae",
+       "selectlist-marker-part.tentative.html": [
+        "dedabc9bab78d96f2485366a6277ae83ca89245f",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-marker-part-ref.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-marker-slot.tentative.html": [
-        "fff911005d8710b63357e9a3b9dca7c8e6b5043a",
+       "selectlist-marker-slot.tentative.html": [
+        "de43a02c33f0e7f2e9db4703c7b3078e10f32d86",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-marker-slot-ref.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-marker-visible-overflow.tentative.html": [
-        "6d39f6f3c50107fe3fcedf3b04bc4bd32dab2564",
+       "selectlist-marker-visible-overflow.tentative.html": [
+        "345c2059837af324d47c31658eeabb8375ad991e",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-option-arbitrary-content-displayed.tentative.html": [
-        "416f2dc2ac0aa598fb59fc3d1adc7c7fb08e7b4e",
+       "selectlist-option-arbitrary-content-displayed.tentative.html": [
+        "2d51002fb2e7e30f5cae4cd1a9452f63641e0dff",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-option-arbitrary-content-not-displayed.tentative.html": [
-        "7bc936e7dc48f1ecc3bc10333b701b47ae24fab3",
+       "selectlist-option-arbitrary-content-not-displayed.tentative.html": [
+        "66b87ec33b9cc279b67c7d7ed9d1d1f617af5611",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-overflow-x.tentative.html": [
-        "0e0c3dba5e852d87272931e1418cf7f6465ef64e",
+       "selectlist-overflow-x.tentative.html": [
+        "93c1b948a096020f1865f9f6ccba93a3c839afa8",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-overflow-x-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-rtl.tentative.html": [
-        "90c06c93d76ef99c3a0e0ee04093f8e8d5147d2b",
+       "selectlist-rtl.tentative.html": [
+        "24f79596321f413025cddc9c5e10a8c34f701d90",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-rtl-ref.tentative.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-selected-value-behavior.tentative.html": [
-        "799b445114120284e67498c650bb4951496478c2",
+       "selectlist-selected-value-behavior.tentative.html": [
+        "a43e43d267a6bb007738ffc311b2f681a09115b5",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior-ref.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-selected-value-part.tentative.html": [
-        "e41d2ddfd66d3af95199eeea3a7b11fd89ae6aa0",
+       "selectlist-selected-value-part.tentative.html": [
+        "8fc05480d15ebf06d12d2be31bf49f801c0018a4",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part-ref.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-selected-value-slot.tentative.html": [
-        "9bbf2dfc06e87438827e50db20f27d51a02d5590",
+       "selectlist-selected-value-slot.tentative.html": [
+        "c69a962c295673f15d6b1923d984341b9023ffd3",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot-ref.html",
            "=="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-writingmode-lr.tentative.html": [
-        "15bd5916bdf0c66059dd009bc980bc6115222e22",
+       "selectlist-writingmode-lr.tentative.html": [
+        "9973696ddd75f568af09d0c89639bdb9fbbc83b6",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-writingmode-tb-ref.html",
            "!="
           ]
          ],
          {}
         ]
        ],
-       "selectmenu-writingmode-rl.tentative.html": [
-        "9cc1056e35aca527e84913d63675c870580a5f66",
+       "selectlist-writingmode-rl.tentative.html": [
+        "dc74203e69c89bc6a31553668ba880ecdd947b99",
         [
          null,
          [
           [
-           "/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html",
+           "/html/semantics/forms/the-selectlist-element/selectlist-writingmode-tb-ref.html",
            "!="
           ]
          ],
@@ -326564,7 +326943,7 @@
       ]
      ],
      "animation-range-visual-test.html": [
-      "8d68603701b515640fcf09240eb2736d085ef7b3",
+      "1ff2b12d1f978303d3bf175742303a46c03cb091",
       [
        null,
        [
@@ -326573,7 +326952,23 @@
          "=="
         ]
        ],
-       {}
+       {
+        "fuzzy": [
+         [
+          null,
+          [
+           [
+            0,
+            64
+           ],
+           [
+            0,
+            15
+           ]
+          ]
+         ]
+        ]
+       }
       ]
      ],
      "deferred-timeline-composited.html": [
@@ -334613,7 +335008,7 @@
    },
    "accname": {
     "META.yml": [
-     "81588fba45662363bbd8df4e1acb8795e8aa16af",
+     "7f538628e8c0b2134f9605106616b3a1d05eb7a7",
      []
     ],
     "manual": {
@@ -338002,7 +338397,7 @@
     ],
     "resources": {
      "helpers.js": [
-      "de6433656921d293ac076efe135dcaeb811c8d02",
+      "c4c8c5b03261458ceabaeb7a7ed736cf812226a1",
       []
      ]
     }
@@ -359055,7 +359450,7 @@
    },
    "core-aam": {
     "META.yml": [
-     "d2e6c9a04868adb90fec38adb00f67d59b2154cb",
+     "a976c16dabce11346831845879b5b2b60dc8f754",
      []
     ],
     "README.md": [
@@ -359206,6 +359601,10 @@
        "190420736dfbd6aaaa468656c236209c25ed11f5",
        []
       ],
+      "manifest_with_no_accounts.json": [
+       "ad3f295ea8543a94401d346cbe4a407de38522a4",
+       []
+      ],
       "manifest_with_single_account.json": [
        "15a657c679df7b0dfb0be1058e7086b439781762",
        []
@@ -359214,6 +359613,10 @@
        "932fb85dac34646c5081558c36c0367455380e39",
        []
       ],
+      "no_accounts.py": [
+       "e3948084df19c878d2251b57894872d7e262aa48",
+       []
+      ],
       "select_manifest_in_root_manifest.py": [
        "d4f1efff6a74c7636f60cba35b4eff010fccfd29",
        []
@@ -359244,7 +359647,7 @@
       ]
      },
      "fedcm-helper.sub.js": [
-      "0acb84010b135010d5a3f9d87117a7dee7aefa42",
+      "2e8f8066817834b884f4cffb0fb18c4dba929c3a",
       []
      ],
      "fedcm-iframe-level2.html": [
@@ -359267,6 +359670,14 @@
       "476f32688f91cede949edf2a1e650ef573525bd7",
       []
      ],
+     "mark_signedin": [
+      "d9adcaa762909e0ddef54daa989848169ede25dc",
+      []
+     ],
+     "mark_signedin.headers": [
+      "21ee3bbb24c6f226e13c4294c2da23435692ba5b",
+      []
+     ],
      "otpcredential-helper.js": [
       "e07e9f5be359e9173b6c916d91d8ce1f87260885",
       []
@@ -386421,6 +386832,10 @@
       "0c68e1396adf54957271b8c3611d3af4189b0375",
       []
      ],
+     "font-size-adjust-reload-ref.html": [
+      "efa8c1d76e18a12788680198638505ddc108f018",
+      []
+     ],
      "font-size-adjust-units-001-ref.html": [
       "008c500d08b239192b742fb4e5e4a507d97a9f4a",
       []
@@ -397486,10 +397901,6 @@
        "df7e684d2ac1ea8108d77a5654573c984ef41802",
        []
       ],
-      "mask-origin-2-ref.html": [
-       "bbb5ef2c4148fd1287f57c134768f1bcb198ff74",
-       []
-      ],
       "mask-origin-3-ref.html": [
        "0271998a2936d892b079fa886f08dc6754edc252",
        []
@@ -406866,6 +407277,14 @@
        "word-break-auto-phrase-overflow-001-ref.html": [
         "d75b50d05d88d3c1d88bf9bcfa192072e0587bfe",
         []
+       ],
+       "word-break-auto-phrase-wbr-nobr-001-ref.html": [
+        "dbc18b8e2918ce3053e8c8e5b4a796eb3234c731",
+        []
+       ],
+       "word-break-auto-phrase-wbr-nobr-002-ref.html": [
+        "72d89af9bf7169214556b61b877b1167a9b5a08c",
+        []
        ]
       },
       "reference": {
@@ -408164,7 +408583,7 @@
       []
      ],
      "preserve3d-pseudo-element-ref.html": [
-      "8b3c3b08af40ee08869366e5465adafb45d98bcc",
+      "c8e68f55995d6280fad1c3f812c012babc0607b8",
       []
      ],
      "reference": {
@@ -411443,9 +411862,13 @@
       "8647be19a8ccb033bc569fb9d1e1e444428f1655",
       []
      ],
-     "wide-keyword-fallback-ref.html": [
+     "wide-keyword-fallback-001-ref.html": [
       "1b4e3b3b6d9ccd9e97bbd8ec2eb82f6f1a5959e3",
       []
+     ],
+     "wide-keyword-fallback-002-ref.html": [
+      "404a3da9d5c5ebac67adee6eafd90b6eb10ae65a",
+      []
      ]
     },
     "css-view-transitions": {
@@ -416031,8 +416454,28 @@
       "5c5ff5f6f2ddc4696f2d51266199fe052464d9e6",
       []
      ],
-     "offset-path-url-ref.html": [
-      "c5f8ec74e8782e095f9ac5eacc241f0fb8d5de88",
+     "offset-path-url-001-ref.html": [
+      "f8fde8afae08222c6ac2fcb0be3ebcb07cf1ed84",
+      []
+     ],
+     "offset-path-url-002-ref.html": [
+      "177d71385fccf70f253cb0e17678a7692a46d937",
+      []
+     ],
+     "offset-path-url-003-ref.html": [
+      "e34976213e3485d4e41702ca6a3a66c8afd67527",
+      []
+     ],
+     "offset-path-url-004-ref.html": [
+      "4ff49d968e0a45bf8e875fae052f9accc2696a97",
+      []
+     ],
+     "offset-path-url-008-ref.html": [
+      "3e99530eb305f0917eea26849cd1c9b329e26968",
+      []
+     ],
+     "offset-path-url-011-ref.html": [
+      "d0f97eda1ddeb11ec8cd65ebc6ff684ad716084b",
       []
      ],
      "offset-rotate-ref.html": [
@@ -417642,7 +418085,7 @@
       []
      ],
      "testharness.md": [
-      "fd4450f44033814f92bcb278f4a588823fe5060e",
+      "e88d5741ca6aeef6952a8fd1357e558cd2ec7476",
       []
      ],
      "tools.md": [
@@ -418493,7 +418936,7 @@
    },
    "dpub-aam": {
     "META.yml": [
-     "a382778f37532342e85555500ed3cf3b3d18b2d1",
+     "5552a2e82eb84d2a4cafcde6e21693ef58feca23",
      []
     ],
     "README.md": [
@@ -418507,7 +418950,7 @@
      []
     ],
     "META.yml": [
-     "c6e339af636dbf7c74fc162b31b17262318cebc3",
+     "b27081355ab093155d397b5bd1facdf54a690fa2",
      []
     ],
     "README.md": [
@@ -420577,6 +421020,10 @@
       "f783c8530c4386321c6da8e7be1ff4732074917d",
       []
      ],
+     "automatic-beacon-unfenced-page.html": [
+      "44f5df32e712329aa1bbacef4c62512ce6292a4d",
+      []
+     ],
      "background-fetch-inner.https.html": [
       "1bca25a957a3fe4069df838a5b7cbaa42e813f9b",
       []
@@ -420870,11 +421317,11 @@
       []
      ],
      "fledge-bidding-logic.py": [
-      "73f4895cebe92f44a31051a97a520e024baffb4d",
+      "85c78acb8bc89428ef7c82470711adc47de602ee",
       []
      ],
      "fledge-decision-logic.py": [
-      "028fe76efc0440716eed988d668d84aa5af4a8d3",
+      "bd615af835bfab6f3f07951d50c4db90f2e3a9f6",
       []
      ],
      "frame-navigation-inner-create-nested.https.html": [
@@ -421125,6 +421572,10 @@
       "1b63235b7cdffe9ebb43bfac3a01d5220e1519fb",
       []
      ],
+     "postmessage-config.html": [
+      "3c20190420028c2a0ce9117a18d7ace6b6526714",
+      []
+     ],
      "prerender-inner.html": [
       "a523ef31c1a3423c3c11b607c7f497209e10054f",
       []
@@ -421282,7 +421733,7 @@
       []
      ],
      "utils.js": [
-      "d812736cdc280ecc048fb17c1e9f0af42ac07647",
+      "a402dfdde4a89765f0792d9925c6b16ae0bbbc1d",
       []
      ],
      "web-bluetooth-inner.html": [
@@ -422716,7 +423167,7 @@
    "fledge": {
     "tentative": {
      "TODO": [
-      "96654d2c592e9c570073afc5da1620020040d24c",
+      "fc2c296762cee6208747460babc154edca2593cc",
       []
      ],
      "resources": {
@@ -422737,7 +423188,7 @@
        []
       ],
       "fledge-util.js": [
-       "cd7bb7044c30ff58f1ca7f18a491516f88618cde",
+       "f941d2285d2d495632e18fd99f97fce38b95aeff",
        []
       ],
       "request-tracker.py": [
@@ -422745,7 +423196,11 @@
        []
       ],
       "trusted-bidding-signals.py": [
-       "cdd7052a96ab42d9a143f9d47a7c71cb6910de72",
+       "9602bd22f9667057c46d3900909ec9bcda832341",
+       []
+      ],
+      "trusted-scoring-signals.py": [
+       "6036d2ef4d122cc767967125840d2c34bed413b7",
        []
       ]
      }
@@ -423284,8 +423739,16 @@
       []
      ]
     },
+    "CanvasTest-ascent256.ttf": [
+     "d5924fc2194a3ae0d9a4eca3c293b14909b2a44e",
+     []
+    ],
+    "CanvasTest-descent0.ttf": [
+     "5887c0de8ddc89e4dcfa9027fa44a2d8a631c465",
+     []
+    ],
     "CanvasTest.ttf": [
-     "9023592ef5aa83a03dd6957398897a585062ca57",
+     "9cdd0faf10818614202d397bb70b97a51a311fd4",
      []
     ],
     "CanvasTest.ttf.headers": [
@@ -424263,7 +424726,7 @@
    },
    "graphics-aam": {
     "META.yml": [
-     "69446b204e7adb00832e5b2b8401e9c48097c93e",
+     "197263836e7695882d4d1fb533c1e043a70ff234",
      []
     ]
    },
@@ -424355,7 +424818,7 @@
      ],
      "resources": {
       "common.js": [
-       "241df1df2420c22f0ac3a54cdd2b089472d28f21",
+       "2fa51aa9c6145f5f65c591b051728722c9bdae3f",
        []
       ],
       "embedding-test.js": [
@@ -426991,6 +427454,10 @@
         "c394ecdfe3904f0afb1e4879241cf38d985155e6",
         []
        ],
+       "2d.layer.global-filter-expected.html": [
+        "88057fc354a4e593191a4b3d5c94cdfa7d466126",
+        []
+       ],
        "2d.layer.global-states.alpha-expected.html": [
         "0666e3098a79e1b54d2155f9af1b6c0f18978f7e",
         []
@@ -427000,7 +427467,7 @@
         []
        ],
        "2d.layer.global-states.alpha.blending.shadow-expected.html": [
-        "d7ba158d161d44ddd127fb10bf11f5bdef62dc51",
+        "f7b633b35f6c02923f88b5bfb67c374e1cfaa3d8",
         []
        ],
        "2d.layer.global-states.alpha.composite-expected.html": [
@@ -427008,11 +427475,11 @@
         []
        ],
        "2d.layer.global-states.alpha.composite.shadow-expected.html": [
-        "a669a2271e96b8f4e5087bb9ffb1888a231a0c78",
+        "0ae93871f522e3efbcec315f054327cad7c02268",
         []
        ],
        "2d.layer.global-states.alpha.shadow-expected.html": [
-        "206eb750139475dc0fada14fe27a040cb00f2fe4",
+        "6f764c500176564f313a10c90332311fbfe88900",
         []
        ],
        "2d.layer.global-states.blending-expected.html": [
@@ -427020,7 +427487,7 @@
         []
        ],
        "2d.layer.global-states.blending.shadow-expected.html": [
-        "02275c8cc2150fac3bdc54f5000a44dc08299b69",
+        "6f969074f93c49d72be2c3289e8081dba2435b90",
         []
        ],
        "2d.layer.global-states.composite-expected.html": [
@@ -427028,7 +427495,7 @@
         []
        ],
        "2d.layer.global-states.composite.shadow-expected.html": [
-        "e380cccab8245f77803000d4eb44dc956b3cf709",
+        "b687c27f4715dd77beb55a46f6466c41427ded65",
         []
        ],
        "2d.layer.global-states.filter.alpha-expected.html": [
@@ -427040,7 +427507,7 @@
         []
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow-expected.html": [
-        "d9c93719b9923dbe75f3135fd9bc7b91cfe56518",
+        "62942ffeaecb91b1c0eb97eaa7c5c658167f0cf8",
         []
        ],
        "2d.layer.global-states.filter.alpha.composite-expected.html": [
@@ -427048,11 +427515,11 @@
         []
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow-expected.html": [
-        "26d13a4cae95274c0edf26ab3e62f74857521fe3",
+        "a64997254626c6551aff04f584bbf9db3ce34209",
         []
        ],
        "2d.layer.global-states.filter.alpha.shadow-expected.html": [
-        "9cc735fd42c1c01a69989eee514311cadf6cb5c3",
+        "169baee29b986f3dc1600c81931a8ce86353eec7",
         []
        ],
        "2d.layer.global-states.filter.blending-expected.html": [
@@ -427060,7 +427527,7 @@
         []
        ],
        "2d.layer.global-states.filter.blending.shadow-expected.html": [
-        "a48485f7e8a1b9b843a8f6324ea822aa81abde93",
+        "91f3725f8ec0119eeabe3af58a3420405056194f",
         []
        ],
        "2d.layer.global-states.filter.composite-expected.html": [
@@ -427068,7 +427535,7 @@
         []
        ],
        "2d.layer.global-states.filter.composite.shadow-expected.html": [
-        "79191ee3910f49c9f69a2454940d8ca88ef7eb78",
+        "4716bb2760f4ddc7d190585ebcb415af138dc2d4",
         []
        ],
        "2d.layer.global-states.filter.no-global-states-expected.html": [
@@ -427076,7 +427543,7 @@
         []
        ],
        "2d.layer.global-states.filter.shadow-expected.html": [
-        "59cf16fa87d6dbc3c73f9dae81452889cc5e33eb",
+        "13ba2dd4cde61db22806f2319ec5cbefac724bb8",
         []
        ],
        "2d.layer.global-states.no-global-states-expected.html": [
@@ -427084,7 +427551,7 @@
         []
        ],
        "2d.layer.global-states.shadow-expected.html": [
-        "ba56644d6c233415f147cb6c17911df099b0446a",
+        "835e9d420ac3494fe603b077dbe5d4226e004a8a",
         []
        ],
        "2d.layer.nested-expected.html": [
@@ -427128,7 +427595,7 @@
         []
        ],
        "2d.layer.several-complex-expected.html": [
-        "84ad6244740e997d62cd0bdf4f017a7a6c15d713",
+        "ef46f69e2a577fb407175bb21fdc94ecb5cdfd6d",
         []
        ],
        "2d.layer.unclosed-expected.html": [
@@ -427822,6 +428289,12 @@
         []
        ]
       },
+      "reset": {
+       "2d.reset.state.clip-expected.html": [
+        "974b37fab4ecf087a518b14306ade81b4f8c924f",
+        []
+       ]
+      },
       "shadows": {
        "2d.shadow.alpha.2.png": [
         "8764e89b371d41428f0ba45d9c0391e41b0dd8a2",
@@ -427881,6 +428354,30 @@
         "fb3b5b830d345d2aa858e41673e08f99977baf08",
         []
        ],
+       "2d.text.fontVariantCaps1-expected.html": [
+        "8ea3c22be13dd3bf1421c3f80b121edcc8b2d3bc",
+        []
+       ],
+       "2d.text.fontVariantCaps2-unexpected.html": [
+        "c64f5d0ec2aea8307ea4ba5257498f2f236186e6",
+        []
+       ],
+       "2d.text.fontVariantCaps3-expected.html": [
+        "069fbfba8823e3e0f5fcf7ada4bd600b6dce1bbd",
+        []
+       ],
+       "2d.text.fontVariantCaps4-expected.html": [
+        "069fbfba8823e3e0f5fcf7ada4bd600b6dce1bbd",
+        []
+       ],
+       "2d.text.fontVariantCaps5-expected.html": [
+        "8ea3c22be13dd3bf1421c3f80b121edcc8b2d3bc",
+        []
+       ],
+       "2d.text.fontVariantCaps6-expected.html": [
+        "c64f5d0ec2aea8307ea4ba5257498f2f236186e6",
+        []
+       ],
        "reference": {
         "direction-default-ref.html": [
          "cef6df259c4801e93e7ce8dd1692e6f3157d77bc",
@@ -427889,18 +428386,6 @@
         "direction-rtl-ref.html": [
          "010526d667b0746a014aa5706b19c001cd16d67e",
          []
-        ],
-        "fontVariantCaps-1-ref.html": [
-         "8ea3c22be13dd3bf1421c3f80b121edcc8b2d3bc",
-         []
-        ],
-        "fontVariantCaps-2-ref.html": [
-         "c64f5d0ec2aea8307ea4ba5257498f2f236186e6",
-         []
-        ],
-        "fontVariantCaps-3-ref.html": [
-         "069fbfba8823e3e0f5fcf7ada4bd600b6dce1bbd",
-         []
         ]
        }
       }
@@ -427947,6 +428432,10 @@
         "c394ecdfe3904f0afb1e4879241cf38d985155e6",
         []
        ],
+       "2d.layer.global-filter-expected.html": [
+        "88057fc354a4e593191a4b3d5c94cdfa7d466126",
+        []
+       ],
        "2d.layer.global-states.alpha-expected.html": [
         "0666e3098a79e1b54d2155f9af1b6c0f18978f7e",
         []
@@ -427956,7 +428445,7 @@
         []
        ],
        "2d.layer.global-states.alpha.blending.shadow-expected.html": [
-        "d7ba158d161d44ddd127fb10bf11f5bdef62dc51",
+        "f7b633b35f6c02923f88b5bfb67c374e1cfaa3d8",
         []
        ],
        "2d.layer.global-states.alpha.composite-expected.html": [
@@ -427964,11 +428453,11 @@
         []
        ],
        "2d.layer.global-states.alpha.composite.shadow-expected.html": [
-        "a669a2271e96b8f4e5087bb9ffb1888a231a0c78",
+        "0ae93871f522e3efbcec315f054327cad7c02268",
         []
        ],
        "2d.layer.global-states.alpha.shadow-expected.html": [
-        "206eb750139475dc0fada14fe27a040cb00f2fe4",
+        "6f764c500176564f313a10c90332311fbfe88900",
         []
        ],
        "2d.layer.global-states.blending-expected.html": [
@@ -427976,7 +428465,7 @@
         []
        ],
        "2d.layer.global-states.blending.shadow-expected.html": [
-        "02275c8cc2150fac3bdc54f5000a44dc08299b69",
+        "6f969074f93c49d72be2c3289e8081dba2435b90",
         []
        ],
        "2d.layer.global-states.composite-expected.html": [
@@ -427984,7 +428473,7 @@
         []
        ],
        "2d.layer.global-states.composite.shadow-expected.html": [
-        "e380cccab8245f77803000d4eb44dc956b3cf709",
+        "b687c27f4715dd77beb55a46f6466c41427ded65",
         []
        ],
        "2d.layer.global-states.filter.alpha-expected.html": [
@@ -427996,7 +428485,7 @@
         []
        ],
        "2d.layer.global-states.filter.alpha.blending.shadow-expected.html": [
-        "d9c93719b9923dbe75f3135fd9bc7b91cfe56518",
+        "62942ffeaecb91b1c0eb97eaa7c5c658167f0cf8",
         []
        ],
        "2d.layer.global-states.filter.alpha.composite-expected.html": [
@@ -428004,11 +428493,11 @@
         []
        ],
        "2d.layer.global-states.filter.alpha.composite.shadow-expected.html": [
-        "26d13a4cae95274c0edf26ab3e62f74857521fe3",
+        "a64997254626c6551aff04f584bbf9db3ce34209",
         []
        ],
        "2d.layer.global-states.filter.alpha.shadow-expected.html": [
-        "9cc735fd42c1c01a69989eee514311cadf6cb5c3",
+        "169baee29b986f3dc1600c81931a8ce86353eec7",
         []
        ],
        "2d.layer.global-states.filter.blending-expected.html": [
@@ -428016,7 +428505,7 @@
         []
        ],
        "2d.layer.global-states.filter.blending.shadow-expected.html": [
-        "a48485f7e8a1b9b843a8f6324ea822aa81abde93",
+        "91f3725f8ec0119eeabe3af58a3420405056194f",
         []
        ],
        "2d.layer.global-states.filter.composite-expected.html": [
@@ -428024,7 +428513,7 @@
         []
        ],
        "2d.layer.global-states.filter.composite.shadow-expected.html": [
-        "79191ee3910f49c9f69a2454940d8ca88ef7eb78",
+        "4716bb2760f4ddc7d190585ebcb415af138dc2d4",
         []
        ],
        "2d.layer.global-states.filter.no-global-states-expected.html": [
@@ -428032,7 +428521,7 @@
         []
        ],
        "2d.layer.global-states.filter.shadow-expected.html": [
-        "59cf16fa87d6dbc3c73f9dae81452889cc5e33eb",
+        "13ba2dd4cde61db22806f2319ec5cbefac724bb8",
         []
        ],
        "2d.layer.global-states.no-global-states-expected.html": [
@@ -428040,7 +428529,7 @@
         []
        ],
        "2d.layer.global-states.shadow-expected.html": [
-        "ba56644d6c233415f147cb6c17911df099b0446a",
+        "835e9d420ac3494fe603b077dbe5d4226e004a8a",
         []
        ],
        "2d.layer.nested-expected.html": [
@@ -428080,7 +428569,7 @@
         []
        ],
        "2d.layer.several-complex-expected.html": [
-        "84ad6244740e997d62cd0bdf4f017a7a6c15d713",
+        "ef46f69e2a577fb407175bb21fdc94ecb5cdfd6d",
         []
        ],
        "2d.layer.unclosed-expected.html": [
@@ -428116,6 +428605,12 @@
         []
        ]
       },
+      "reset": {
+       "2d.reset.state.clip-expected.html": [
+        "974b37fab4ecf087a518b14306ade81b4f8c924f",
+        []
+       ]
+      },
       "shadows": {
        "2d.shadow.alpha.2.png": [
         "8764e89b371d41428f0ba45d9c0391e41b0dd8a2",
@@ -428175,24 +428670,34 @@
         "fb3b5b830d345d2aa858e41673e08f99977baf08",
         []
        ],
+       "2d.text.fontVariantCaps1-expected.html": [
+        "942bcdec9cb938536738ef1f71a60cd1c85c9086",
+        []
+       ],
+       "2d.text.fontVariantCaps2-unexpected.html": [
+        "dbcb8abd76a544d8a5ab48b1f477fc54c7ba008f",
+        []
+       ],
+       "2d.text.fontVariantCaps3-expected.html": [
+        "8d96d0ab0320ea8412e0045f59b6a3ca18260242",
+        []
+       ],
+       "2d.text.fontVariantCaps4-expected.html": [
+        "8d96d0ab0320ea8412e0045f59b6a3ca18260242",
+        []
+       ],
+       "2d.text.fontVariantCaps5-expected.html": [
+        "942bcdec9cb938536738ef1f71a60cd1c85c9086",
+        []
+       ],
+       "2d.text.fontVariantCaps6-expected.html": [
+        "dbcb8abd76a544d8a5ab48b1f477fc54c7ba008f",
+        []
+       ],
        "canvas.2d.fontStretch-ref.html": [
         "00ecdccad3743db0d0a1ec99850f80ea7964d512",
         []
-       ],
-       "reference": {
-        "fontVariantCaps-1-ref.html": [
-         "942bcdec9cb938536738ef1f71a60cd1c85c9086",
-         []
-        ],
-        "fontVariantCaps-2-ref.html": [
-         "dbcb8abd76a544d8a5ab48b1f477fc54c7ba008f",
-         []
-        ],
-        "fontVariantCaps-3-ref.html": [
-         "8d96d0ab0320ea8412e0045f59b6a3ca18260242",
-         []
-        ]
-       }
+       ]
       }
      },
      "resources": {
@@ -428356,7 +428861,7 @@
         []
        ],
        "layers.yaml": [
-        "babe3a4f5b19e989503cc2bbd941a5617f4f3798",
+        "dd33e05a4d85e3c7bde50f2713d48589d9c19625",
         []
        ],
        "line-styles.yaml": [
@@ -428372,7 +428877,7 @@
         []
        ],
        "reset.yaml": [
-        "4107166248a8a652fbc0441e3c4d30bf71bb4484",
+        "fdb7f815c27ee7f3826276a64c52076b5074d22c",
         []
        ],
        "scroll.yaml": [
@@ -428384,7 +428889,7 @@
         []
        ],
        "text.yaml": [
-        "de28898152fd7d0caec4d2cf114a7c9b1154023c",
+        "93c86b8b5e59e4c9817698d248e3b670c69c9528",
         []
        ],
        "the-canvas-state.yaml": [
@@ -429564,6 +430069,10 @@
        "test-render-blocking.js": [
         "71d0d680966127b8d51ceddf35c6330900e80427",
         []
+       ],
+       "utils.js": [
+        "9a890ab685c675ee5baca618ce5d85b367761760",
+        []
        ]
       }
      },
@@ -435886,73 +436395,73 @@
         []
        ]
       },
-      "the-selectmenu-element": {
-       "selectmenu-explicit-size-ref.tentative.html": [
-        "53296f6daac135bfd6a6a5ace7dbb8e102779561",
+      "the-selectlist-element": {
+       "selectlist-explicit-size-ref.tentative.html": [
+        "3e967d03ed0874114de787994019727151f425ac",
         []
        ],
-       "selectmenu-font-size-ref.tentative.html": [
-        "a01455aab09955c6ad8146a7846ae96250552ca6",
+       "selectlist-font-size-ref.tentative.html": [
+        "46d6dbdb9b2c740dfe1dd3ef5a8e44a766cbd786",
         []
        ],
-       "selectmenu-marker-end-aligned-ref.tentative.html": [
-        "5985df5936bcece5d206527b9030c60b2a8507f6",
+       "selectlist-marker-end-aligned-ref.tentative.html": [
+        "b1df8a65816380fd9573e8f463542c50e888b781",
         []
        ],
-       "selectmenu-marker-part-ref.html": [
-        "cec447509eba28a17ca10636744e448ba64c5cb5",
+       "selectlist-marker-part-ref.html": [
+        "1a1302b96db7acdaa91d1d3551a5a047d41c13af",
         []
        ],
-       "selectmenu-marker-slot-ref.html": [
-        "54bdefb76192c5bd138695dae630676fdd2b292e",
+       "selectlist-marker-slot-ref.html": [
+        "e910df4c5abc609d619c607a9393a4c6f96d37ba",
         []
        ],
-       "selectmenu-marker-visible-overflow-ref.tentative.html": [
-        "674de192e4c43c7fe9b1869e92f4f80b6e43957f",
+       "selectlist-marker-visible-overflow-ref.tentative.html": [
+        "dda53db5bf859f4c5e00d578028d02236111b454",
         []
        ],
-       "selectmenu-option-arbitrary-content-displayed-ref.tentative.html": [
-        "c890bb63f1bdd4041fc94e869bcfc88f927ff534",
+       "selectlist-option-arbitrary-content-displayed-ref.tentative.html": [
+        "61b1c1a7108b93296022d24ca12348dd6d80384e",
         []
        ],
-       "selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html": [
-        "d12943105f8c47d32f47eec0aa773a9a98046bfa",
+       "selectlist-option-arbitrary-content-not-displayed-ref.tentative.html": [
+        "fa44198fff0a91dcab4ff722858a4f128e2960a1",
         []
        ],
-       "selectmenu-overflow-x-ref.tentative.html": [
-        "8fd33dbc0722c04ff4711cabfd285e392f0071d6",
+       "selectlist-overflow-x-ref.tentative.html": [
+        "df87060359bc38d6e7da8cab9c38167ed5249353",
         []
        ],
-       "selectmenu-rtl-ref.tentative.html": [
-        "42b2541fd516b0a086a8e50b8e7b0c15892d7bf4",
+       "selectlist-rtl-ref.tentative.html": [
+        "70d2b98d33081ec9326c1bda67445421161f0f38",
         []
        ],
-       "selectmenu-selected-value-behavior-ref.html": [
-        "bf468c5516cdbdab072983beaf1f506e62ed2251",
+       "selectlist-selected-value-behavior-ref.html": [
+        "7d76f1c8176d898241d19f2705ce24e15e09620c",
         []
        ],
-       "selectmenu-selected-value-part-ref.html": [
-        "744846b5511e399b2f167862df0c18d8fffec3cc",
+       "selectlist-selected-value-part-ref.html": [
+        "3be168beba95e20a16671cc05260ed57fbfb5a25",
         []
        ],
-       "selectmenu-selected-value-slot-ref.html": [
-        "3b322bf79157dd71630050998977185af3b99a70",
+       "selectlist-selected-value-slot-ref.html": [
+        "ecb8c886a1d1ec39f99a389917e40a56e958dbf6",
         []
        ],
-       "selectmenu-writingmode-tb-ref.html": [
-        "d2486ad9cc218e5bf05bb843ecc114c712da683d",
+       "selectlist-writingmode-tb-ref.html": [
+        "db922f5f9fbb802cfa7baae92fb7a327ce4f3672",
         []
        ],
        "support": {
         "back.html": [
-         "0d13a0f3b7c9c759a9a29c0d70a535b398ff108e",
+         "9cc5a1d6034e7cf2a234728e0d943f3ec6676d01",
          []
         ],
-        "fake-selectmenu.js": [
-         "2e084450a364ecd44d1a6a023eb0654b0db975d9",
+        "fake-selectlist.js": [
+         "c17fe1afc5fd205c66c8f696c883d422516110f3",
          []
         ],
-        "selectmenu_button_icon.svg": [
+        "selectlist_button_icon.svg": [
          "1a6c0193e819a1480f0a7f85f1fc65fdbd33742d",
          []
         ]
@@ -449472,7 +449981,7 @@
        "idlharness": {
         "IdlDictionary": {
          "test_partial_interface_of.html": [
-          "05e6e0b1e06c634ec2900ca4302b611dda72ea14",
+          "f635768c69f7e531a590d12c7163aed762993ef4",
           []
          ]
         },
@@ -449490,7 +449999,7 @@
           []
          ],
          "test_partial_interface_of.html": [
-          "671196cc5dfedc2140aaaccebcc6ff0d7127e35e",
+          "7dd9e676af4c1b52bedaa21c05f9c03e1b3ab4ef",
           []
          ],
          "test_primary_interface_of.html": [
@@ -455878,11 +456387,11 @@
       []
      ],
      "lint.py": [
-      "9fc78d9b68e5e0cdaf432c2b914f00603a1961e7",
+      "00d76144ea8afc1240b9d5afcc7e0c91a51ae872",
       []
      ],
      "rules.py": [
-      "88b7b6d80c360ec473b82a9bf3a1aefc7b9cc12e",
+      "580ef8009cdb828aab572101c61deed9439553a9",
       []
      ],
      "tests": {
@@ -456079,7 +456588,7 @@
        }
       },
       "test_file_lints.py": [
-       "9a49d6e7a24066365a815cf0ce773133d009a8bf",
+       "62a380e1a407430516b61eac7d12cefafdfea7a4",
        []
       ],
       "test_lint.py": [
@@ -456169,7 +456678,7 @@
        []
       ],
       "test_sourcefile.py": [
-       "4b98e718d0328c56912ab0edbea791ac51d7610a",
+       "298e480c142c54bfabdc9d6de0ba3bfe695cc472",
        []
       ],
       "test_utils.py": [
@@ -464400,7 +464909,7 @@
         []
        ],
        "chrome.py": [
-        "3d97ccbd976ffd343a2024f4860e7f1d3bcb653e",
+        "047bfa02451f72c0e7fc8a10ece2df1def5fffbe",
         []
        ],
        "chrome_android.py": [
@@ -464420,7 +464929,7 @@
         []
        ],
        "content_shell.py": [
-        "4bbb42cc2677a128764490bbe75b733af9849af0",
+        "45fb48a6272d5ffa9eeeb7b9628880c835c93139",
         []
        ],
        "edge.py": [
@@ -464520,7 +465029,7 @@
         []
        ],
        "executorcontentshell.py": [
-        "1ff25781ba40997f713c52b0018a721e62f436cb",
+        "8ca0a7a9a604bcc410a9efa01634c7a08c1ba697",
         []
        ],
        "executormarionette.py": [
@@ -464875,7 +465384,7 @@
        }
       },
       "wptrunner.py": [
-       "0cb71bcbfad301b0ec0fa7eede71778a8d9805ea",
+       "1ea44041d93db03ad9345d5850ba24e5676aa31a",
        []
       ],
       "wpttest.py": [
@@ -466151,7 +466660,7 @@
    },
    "wai-aria": {
     "META.yml": [
-     "502b9c302510b37d490399c4e782405c6cda0ef7",
+     "17068230e58323c5151dab2bd93f170b757ed316",
      []
     ],
     "manual": {
@@ -467867,7 +468376,7 @@
        },
        "capture_screenshot": {
         "__init__.py": [
-         "6a21f11e7ba8317346583083a5729dd3cc602e6f",
+         "18f64fb518917f6a5054089338fc4a53967d1fa0",
          []
         ]
        },
@@ -496968,6 +497477,33 @@
       }
      ]
     ],
+    "closewatcher-dialog-popover.html": [
+     "f6443c4317ebd704c48ecff0ae377519d3159e2c",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "dialog-cancel-events-closewatcher.html": [
+     "5b1da9a2e37811e389e60ddbc358fa99e89817a6",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "dialog-cancel-preventDefault-closewatcher.html": [
+     "ef99578ca97dfa2f6ad48d577133b2ab6bf4157b",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "esc-key.html": [
      "16fcce691730c686c4191318b819ba9b93756f04",
      [
@@ -497020,6 +497556,15 @@
       }
      ]
     ],
+    "user-activation-CloseWatcher.html": [
+     "70435993f54cddf6d2d68b5b0ffd7a81642c4f4f",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "user-activation-multiple-plus-free.html": [
      "a94b47904a10a9116b69fbc87b8cd78f09d602d2",
      [
@@ -497029,10 +497574,16 @@
       }
      ]
     ],
-    "user-activation.html": [
-     "4591f5493b2fd8e7c74d4eafbe9a05322c04ea37",
+    "user-activation-shared.html": [
+     "6ecc2dc694d7486c18523be2d2301d30a306d1bc",
      [
-      null,
+      "close-watcher/user-activation-shared.html?CloseWatcher",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "close-watcher/user-activation-shared.html?dialog",
       {
        "testdriver": true
       }
@@ -508018,7 +508569,7 @@
       }
      ]
     ],
-    "fedcm-not-observer-by-service-worker.https.html": [
+    "fedcm-not-observed-by-service-worker.https.html": [
      "072d66966566c939bfa5ba64db1d62e7247dab81",
      [
       null,
@@ -523918,7 +524469,7 @@
        ]
       ],
       "mask-invalid.html": [
-       "367049cf19ffc2390316470dec3d789fbbee36a8",
+       "f9999ca98284eba958eeb5236282fa3b852f41be",
        [
         null,
         {}
@@ -523960,7 +524511,7 @@
        ]
       ],
       "mask-valid.sub.html": [
-       "e0646444d48dd3d92f85d2f50323e984dbe9877e",
+       "6b6d712d175b00692786dcd67213acdb53c5736b",
        [
         null,
         {}
@@ -527431,6 +527982,15 @@
        {}
       ]
      ],
+     "overscroll-snap.html": [
+      "b34caf87f123fa5e6d4b7523bf22bfa2887284c7",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "parsing": {
       "scroll-margin-block-inline-computed.html": [
        "3bb0e740acf187969777e470a8f7e9ee2a648b02",
@@ -544870,7 +545430,7 @@
       ]
      ],
      "user-invalid.html": [
-      "222f36e33b3ed31c5d6c796eb7c73e5e52fdf6dc",
+      "e7e008e677bc781502b0cb8367a7ba19d7fd57c4",
       [
        null,
        {
@@ -544879,7 +545439,7 @@
       ]
      ],
      "user-valid.html": [
-      "12b89282c3ec70486803566237bfafe993e70bc2",
+      "86e756df2ee29694b9b0c9e08d2ce62c8acc7faa",
       [
        null,
        {
@@ -568557,6 +569117,15 @@
       }
      ]
     ],
+    "automatic-beacon-shared-storage.https.html": [
+     "a21e42a488190e332a5fb75d744f711cbe8fadd2",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "automatic-beacon-two-events-clear.https.html": [
      "61543ffa4856060f2cf48d46e4ccb6158146e4ad",
      [
@@ -568575,6 +569144,15 @@
       }
      ]
     ],
+    "automatic-beacon-unfenced-top.https.html": [
+     "49c4ba84e08b709c6be51868a72a17fab9860fe1",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "background-fetch.https.html": [
      "7036f2bb5f3bb5e42b5af1b5f970141c0884b5ef",
      [
@@ -568784,7 +569362,7 @@
      ]
     ],
     "deep-copy-config.https.html": [
-     "37b27a742b94f345778cee14fc2013be41d8d15e",
+     "54a976233cbc2a4d4c5b684fd4adfff5ee06c9e5",
      [
       null,
       {}
@@ -582580,7 +583158,7 @@
      ]
     ],
     "showPicker-errors.https.window.js": [
-     "ed66e1093b1cf8eb8a9657f2d89ae64dd68ec1f3",
+     "b2eeed90210d1fffcd53006b32c0f92e883b0ddf",
      [
       "file-system-access/showPicker-errors.https.window.html",
       {
@@ -582667,7 +583245,7 @@
       ]
      ],
      "join-leave-ad-interest-group.https.sub.window.js": [
-      "d1d6d50e4b0bb0c42c5bdd1fc9ea2a46251f3db8",
+      "9b2b501fc720e02ef133663ccce56462c53010e4",
       [
        "fledge/tentative/join-leave-ad-interest-group.https.sub.window.html",
        {
@@ -582774,6 +583352,33 @@
        }
       ]
      ],
+     "round-a-value.https.sub.window.js": [
+      "252e4db00fbb6151a45cf7042c96d19ac5ae818e",
+      [
+       "fledge/tentative/round-a-value.https.sub.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
      "send-report-to.https.sub.window.js": [
       "087140af3ef51ac69ddcfa3efdf4b5f97bfa44ad",
       [
@@ -582802,7 +583407,7 @@
       ]
      ],
      "trusted-bidding-signals.https.sub.window.js": [
-      "0f8b2396392ab0f58e3c84d8900248c1b7fe2d8a",
+      "90c1c39fd6eb094d7b3470d0a481ae6bf870ea08",
       [
        "fledge/tentative/trusted-bidding-signals.https.sub.window.html",
        {
@@ -582827,6 +583432,33 @@
         "timeout": "long"
        }
       ]
+     ],
+     "trusted-scoring-signals.https.sub.window.js": [
+      "94385fd731ad3400b39449a71445c7154a0b96e6",
+      [
+       "fledge/tentative/trusted-scoring-signals.https.sub.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/testdriver.js"
+         ],
+         [
+          "script",
+          "/common/utils.js"
+         ],
+         [
+          "script",
+          "resources/fledge-util.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
      ]
     }
    },
@@ -587103,7 +587735,7 @@
       ]
      ],
      "fenced-frame-bypass.tentative.https.window.js": [
-      "354abffb9ccd108d4b51a7e336ed588f18cfc9e9",
+      "e5d12397a9af11fd9d5dde1d3d484e7c7627192c",
       [
        "html/anonymous-iframe/fenced-frame-bypass.tentative.https.window.html",
        {
@@ -587120,6 +587752,10 @@
           "script",
           "/common/dispatcher/dispatcher.js"
          ],
+         [
+          "script",
+          "/fenced-frame/resources/utils.js"
+         ],
          [
           "script",
           "/html/cross-origin-embedder-policy/credentialless/resources/common.js"
@@ -587138,7 +587774,7 @@
       ]
      ],
      "fenced-frame.tentative.https.window.js": [
-      "a9cdcbbd560298361856aaa5a32081fd46936f20",
+      "c72341fc5c9b283e524de6f313d48c21689f08f8",
       [
        "html/anonymous-iframe/fenced-frame.tentative.https.window.html",
        {
@@ -587985,7 +588621,7 @@
         ]
        },
        "popstate_event.html": [
-        "a41fabf9686cda0a6299c5b8bc3ab6d03ff3b627",
+        "05b1dbf4b712d1a96f350b8359d66697b7c58e23",
         [
          null,
          {}
@@ -596879,6 +597515,13 @@
          {}
         ]
        ],
+       "2d.layer.layer-rendering-state-reset-in-layer.html": [
+        "9283fd39b7d265860c0e1eafffcefc46783c4a87",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.layer.valid-calls.beginLayer-endLayer.html": [
         "609cb19a7d861b23ac1453ce7f0b6f1693827d2d",
         [
@@ -599415,6 +600058,202 @@
          null,
          {}
         ]
+       ],
+       "2d.reset.state.direction.html": [
+        "8b27e3cfe443da6c8180eb29dec6800e0eb57245",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.fill_style.html": [
+        "1239e2ec7fb1b0a3106c751d7d3f34909bf2b8ab",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.filter.html": [
+        "80ccd22bb2b0969985e0862d1a907f7aba43eff1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font.html": [
+        "c93d038a62251aafde521167d3ede1be62086290",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font_kerning.html": [
+        "d3ad9d386cbd81f1a51e054ff6365d85cbb779b0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font_stretch.html": [
+        "0a91c640b264ff9124fd88b814fff8b0be39e8ed",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font_variant_caps.html": [
+        "262c4fc4d3a938919e826afb921fed1e25d4afc6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.global_alpha.html": [
+        "18b825e60fd0b9bec1b17188d84f278791a108b8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.global_composite_operation.html": [
+        "aee6841d955c486025b1dec27a8b491dbe922c0f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.image_smoothing_enabled.html": [
+        "e865967a38fecf6a7e11fcb51d024001f47a76fc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.image_smoothing_quality.html": [
+        "e78abfce77ea028a8c3b9f5852dad7fda9b17802",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.letter_spacing.html": [
+        "3e732b1fa0538bc05d696d171e6f6e879744dabc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_cap.html": [
+        "8020e284a7431695f20b6a901afa561ad63997c9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_dash.html": [
+        "ca68ae515887b814965bda55621a355310f3dbde",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_dash_offset.html": [
+        "10015199b9306ab74568d7fa62819451280d5fc3",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_join.html": [
+        "1c20cb1b2aebddb1e10c8c234ab6b78e3900edf3",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_width.html": [
+        "db2516b53501005ec2ca1d0de9dd74bd0b22134e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.miter_limit.html": [
+        "7920c38d52c6519ed42054908076b96d1a8f121a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_blur.html": [
+        "07784de7d555118c3018691d1286e9501499340e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_color.html": [
+        "9e8ee6c7f5a44f71eba1699f38efa78fb2b6a7a1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_offset_x.html": [
+        "7992ce4c1e75eebc4bff6199fd2fc2a6969a7fee",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_offset_y.html": [
+        "84a38e0bdbb75f97b189444ee5db3f725cd9ffc1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.stroke_style.html": [
+        "4acb19c41ebbea716ed61db68c6111eb5972a3d8",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.text_align.html": [
+        "a625737d722660463b43ae67edf777f1224142f2",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.text_baseline.html": [
+        "2e4169bdb1e106f3eceed65bd73af7cc69f69dd0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.text_rendering.html": [
+        "e182babee4d3ad15e7182ed700b8ced65df8789c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.transformation_matrix.html": [
+        "7872681bfc4c17250d7bd92996a0f5cdb319a745",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.word_spacing.html": [
+        "c4a448f21c456db5159ed6fffa73e1e33d642ab6",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "scroll": {
@@ -600311,8 +601150,36 @@
          {}
         ]
        ],
+       "2d.text.measure.emHeights-low-ascent.html": [
+        "7b6874d10b5088f75fdfe44d74a43e197637b5ed",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.emHeights-zero-descent.html": [
+        "c3ce994fa14a705ff9ed0045d2d14b2b231ca0bd",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.text.measure.emHeights.html": [
-        "e39fc06c411b7ffb8cbca2bde5a89c990fa6494d",
+        "0db4c30801ffcf796e779b3642ebc54b62f363bc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.fontBoundingBox-reduced-ascent.html": [
+        "653d26d820e34ef5c1172bb9f88dde95179c22a1",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.fontBoundingBox-zero-descent.html": [
+        "785c0bc1866f0dcbd4825c1fb3867f62413dcc5b",
         [
          null,
          {}
@@ -600326,7 +601193,7 @@
         ]
        ],
        "2d.text.measure.fontBoundingBox.html": [
-        "375910593aac5edf56af87be3609e39407650dc1",
+        "9e7e190754d1bcaeb6f3398eedf9ff19e189240d",
         [
          null,
          {}
@@ -606449,6 +607316,20 @@
          {}
         ]
        ],
+       "2d.layer.layer-rendering-state-reset-in-layer.html": [
+        "867553b45e0f4587eb1f3395c5a0b8236ae71615",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.layer.layer-rendering-state-reset-in-layer.worker.js": [
+        "5c2bb73e8f8423aa0a3971ec6a1b8bfe60fdf2ba",
+        [
+         "html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.html",
+         {}
+        ]
+       ],
        "2d.layer.valid-calls.beginLayer-endLayer.html": [
         "0a6e195ca8636ea34cc488cb52c4a93a40c10ca1",
         [
@@ -610707,6 +611588,414 @@
         ]
        ]
       },
+      "reset": {
+       "2d.reset.basic.html": [
+        "7396ca120a3ad68227f7e5f2c69d173721ea39bc",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.basic.worker.js": [
+        "180bffbfac33a4998deba996677308efd6412cc1",
+        [
+         "html/canvas/offscreen/reset/2d.reset.basic.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.direction.html": [
+        "f2dc299e971314b924a03c1380522929a0c9f8f3",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.direction.worker.js": [
+        "3d6b8350509ffbd05cc85a9ddd3e977bfd3a889e",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.direction.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.fill_style.html": [
+        "1fdd2b773a6541861a5d3b4031cce1bf2489184b",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.fill_style.worker.js": [
+        "c574824b0ab527f57b734e34ad4bc5faf6a91d78",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.filter.html": [
+        "af898c7dd12f892dcaca9746d5eecd2941b8887f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.filter.worker.js": [
+        "f781a9fa340f84a402bfa865cd668224d92a66d3",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.filter.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.font.html": [
+        "69bbf3261e2b4b68ed87682411d4004bf158d06e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font.worker.js": [
+        "ea6f4cc1846240e28a25f19085b94e1b0fe19501",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.font.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.font_kerning.html": [
+        "27954486c081ce3833096fea6070855a3ac09d4a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font_kerning.worker.js": [
+        "1c21249b9cb13b2f0dddbaee5626c56fc0f1a451",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.font_stretch.html": [
+        "b1e221732073cd42862ed0b575c10284a41ca193",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font_stretch.worker.js": [
+        "71bb6aff480e984b501ccfb1d4a1dc754db1d989",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.font_variant_caps.html": [
+        "7d0518c021eca644fe4b7cad0cc7c21e43c08485",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.font_variant_caps.worker.js": [
+        "e89a8bda428a2fa19f75407167662cbabc632a25",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.global_alpha.html": [
+        "fe87aedf84bb8e935539fb21677b94b5332a3837",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.global_alpha.worker.js": [
+        "518a8cbb461242df6193a4df514e47650b165e29",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.global_composite_operation.html": [
+        "647349c94a27f8b79c562087589940d93a943ae0",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.global_composite_operation.worker.js": [
+        "c94f15b23250a68afe6cf4b443cacb954469f592",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.image_smoothing_enabled.html": [
+        "c0b7f29acaa5e61edd851fd80965d6dd99dc0f76",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.image_smoothing_enabled.worker.js": [
+        "7010fb899c158d910877c8e71c58f38f25717212",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.image_smoothing_quality.html": [
+        "12a6367ff971383dcf059012bebfb4cbc877f80f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.image_smoothing_quality.worker.js": [
+        "7429666691109d3e9635e389a4f024a20d2984da",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.letter_spacing.html": [
+        "addb0c62ad2c4a2bbb4118d2262fbbc38544de4e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.letter_spacing.worker.js": [
+        "e0dfae0a8e544012e51f9e0bca27da19d768c8e3",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.line_cap.html": [
+        "9b528b344830eae7d93ecbe190507a810216ba93",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_cap.worker.js": [
+        "c3a94f2cbb3d70ce62b99baa6ecbbc685db5100b",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.line_dash.html": [
+        "fd4edf58cf0f22fbf02a87a987b81a2952b01b49",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_dash.worker.js": [
+        "841475d876083bd45d616338f2255d910cad69ee",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.line_dash_offset.html": [
+        "475db49f82d4f4f3f31573b658adcd561c4baf61",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_dash_offset.worker.js": [
+        "5e0d8dd47c825cf8d47859161d5d901ea59d6dfc",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.line_join.html": [
+        "793c1d9bc4b75061191de23094409fc6361dd7b6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_join.worker.js": [
+        "9d5e76757b1f92dc6f5c934d9eb7b1efa1be532d",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.line_join.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.line_width.html": [
+        "8cdf45f700587539d6a9bbca1230c30bc67d8bc3",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.line_width.worker.js": [
+        "1e28f93d66ad017532ef50a42a6ad9532c7d88ef",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.line_width.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.miter_limit.html": [
+        "7f47f9a6be028730151ed0e6fd4fa1b862bbc476",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.miter_limit.worker.js": [
+        "3945a662d492d3e099d583930279a967eb78e488",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_blur.html": [
+        "e7075ce102e528e7951bae234639e28c191130fd",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_blur.worker.js": [
+        "d82933169d159f110cd9ea24a33edf84c92636e1",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_color.html": [
+        "ad928acf46a372a3a972e25593cf1cfddd663daa",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_color.worker.js": [
+        "6ad1e83be22d73581f02e4d85fcff9681d60b96b",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_offset_x.html": [
+        "e3742e4dbc33945a29370d0f4319003b58e64de6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_offset_x.worker.js": [
+        "4247820a4d182324daed1a30ad50c83814ead19e",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_offset_y.html": [
+        "64901ef492b406ef61dadd7f08478b63f9d87ea7",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.shadow_offset_y.worker.js": [
+        "0c1926ebcaad67ca3e96531a0be5b788610a4c80",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.stroke_style.html": [
+        "79803b28288b501c5a3573f5e575ff25176a1e3b",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.stroke_style.worker.js": [
+        "99e1eaaed581cf363e356f86ffd0b49d3c1c8819",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.text_align.html": [
+        "c1a33d6f3dfb70b0063c2a1092a2591b73ddb359",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.text_align.worker.js": [
+        "087d3195e41595e21553d106aa2f2a0ccab2f5b9",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.text_align.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.text_baseline.html": [
+        "acb56e4a00886774b3f1ff96c5e46f4181bdbca9",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.text_baseline.worker.js": [
+        "9a171326cb25cc4f9641fe6b0dd19f5b5e232dbd",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.text_rendering.html": [
+        "174dbb380144fafbbb340340254c0c45b6046a99",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.text_rendering.worker.js": [
+        "df4cea10445a23ec8a3333c35e727bee6eef4791",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.transformation_matrix.html": [
+        "c30e459b30214aee2d970b17d716a60fafaf28c6",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.transformation_matrix.worker.js": [
+        "2ae105c20e9fadb43f5a1dfa3a2caad6beaf9233",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.html",
+         {}
+        ]
+       ],
+       "2d.reset.state.word_spacing.html": [
+        "470db2cf980806a5bfbf3cf87d42af3a980f4b83",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.reset.state.word_spacing.worker.js": [
+        "9e8c717f78a39afeec27f9dbaf79b5dd10aab145",
+        [
+         "html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.html",
+         {}
+        ]
+       ]
+      },
       "shadows": {
        "2d.shadow.alpha.1.html": [
         "765cf41b213e7acd5764ea56f8880fb38846775c",
@@ -612404,20 +613693,76 @@
          {}
         ]
        ],
+       "2d.text.measure.emHeights-low-ascent.html": [
+        "2e2e5dde6723d43ec9ff96d75bbe13194ea5a32e",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.emHeights-low-ascent.worker.js": [
+        "09ee7873092aa05d7cb3dd84642580f2facde0d7",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.html",
+         {}
+        ]
+       ],
+       "2d.text.measure.emHeights-zero-descent.html": [
+        "e39c08ce821d68d85277cad005b9e82a06d68649",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.emHeights-zero-descent.worker.js": [
+        "a2f09782c98fca68f6fcc0a2e4cac2736a9d3813",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.html",
+         {}
+        ]
+       ],
        "2d.text.measure.emHeights.html": [
-        "a92ce58a00e7a1f0f928137fd9e218ad82f9f4f3",
+        "0764279df319a70fdf7d03456ad0176471e65b16",
         [
          null,
          {}
         ]
        ],
        "2d.text.measure.emHeights.worker.js": [
-        "68db6de88d0f0d354bb9e63c3728daa8c15bab74",
+        "0385d3d737daa6304a14d27b1e26a93c629ee057",
         [
          "html/canvas/offscreen/text/2d.text.measure.emHeights.worker.html",
          {}
         ]
        ],
+       "2d.text.measure.fontBoundingBox-reduced-ascent.html": [
+        "51eb2c822c493f7ca295a158be4c64076f48867c",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.fontBoundingBox-reduced-ascent.worker.js": [
+        "dea67ff8f6722ed08f2916a18c2e71bb42e2fd73",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.html",
+         {}
+        ]
+       ],
+       "2d.text.measure.fontBoundingBox-zero-descent.html": [
+        "ea65e58b5c59af389ae92ec3027e61cd0127b292",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.fontBoundingBox-zero-descent.worker.js": [
+        "99a886d015cf236eae1d40ea2d54530f25550c83",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.html",
+         {}
+        ]
+       ],
        "2d.text.measure.fontBoundingBox.ahem.html": [
         "cb8b0c558dbbcde67b7e96a9f1e11f6bad44014a",
         [
@@ -612433,14 +613778,14 @@
         ]
        ],
        "2d.text.measure.fontBoundingBox.html": [
-        "e32780334262f971a5431ac97d3a1d27a016f4d4",
+        "36b11f31d7fd5355412382dc2f79988372b6c79a",
         [
          null,
          {}
         ]
        ],
        "2d.text.measure.fontBoundingBox.worker.js": [
-        "ca272760fd410f4397df1697181c0b24e2c98220",
+        "b2cde04c0dadfde2397249cf76c1a0966d5ce6b8",
         [
          "html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.html",
          {}
@@ -612773,7 +614118,7 @@
       },
       "the-offscreen-canvas": {
        "2d-getcontext-options.any.js": [
-        "8c4e7cfe961fe6d99ee42fdf8d91fa67c7a3a751",
+        "930f7722ee0eae02674c6773751d04c69f4bb384",
         [
          "html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.html",
          {}
@@ -618443,6 +619788,20 @@
         {}
        ]
       ],
+      "document-render-blocking-partial.tentative.html": [
+       "89ab05ed845da69b3d82153a77652349a68a3d81",
+       [
+        null,
+        {}
+       ]
+      ],
+      "document-render-blocking.tentative.html": [
+       "909029b73db0594adb1a940a47b8047b1fc298a4",
+       [
+        null,
+        {}
+       ]
+      ],
       "non-render-blocking-scripts.optional.html": [
        "a4c32ea037b7b47490c54ddd7616b88bfebcdc76",
        [
@@ -629938,16 +631297,16 @@
         ]
        ]
       },
-      "the-selectmenu-element": {
-       "selectmenu-ask-for-reset.html": [
-        "3993c139506188eabe549a3bf92f9967e58de47b",
+      "the-selectlist-element": {
+       "selectlist-ask-for-reset.html": [
+        "7cf2aff51594fa334dffe300f88a152d06b8918e",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-disabled.tentative.html": [
-        "0fe722fdfed1921247ed295148ccbb4aa4718fca",
+       "selectlist-disabled.tentative.html": [
+        "f557804d9bf3d81daa2132d604d1085e65e6fca7",
         [
          null,
          {
@@ -629955,8 +631314,8 @@
          }
         ]
        ],
-       "selectmenu-events.tentative.html": [
-        "830daaabc386113af7f11f58c5aaa5efa9256110",
+       "selectlist-events.tentative.html": [
+        "94577815cd075c7876a5bd8a44e766741af16124",
         [
          null,
          {
@@ -629964,15 +631323,15 @@
          }
         ]
        ],
-       "selectmenu-form-attribute.tentative.html": [
-        "16ee1b8045654a0afb6460dc7bc02974d68281ff",
+       "selectlist-form-attribute.tentative.html": [
+        "c1872b930392d1f6e7a8a510b99b9337ceff4254",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-form-elements.tentative.html": [
-        "eed098256ca41f5f5982e8804f03309f6c4ce755",
+       "selectlist-form-elements.tentative.html": [
+        "07e5be6ef4f47fc4ddc048923999f9bbf4ff80f8",
         [
          null,
          {
@@ -629980,22 +631339,22 @@
          }
         ]
        ],
-       "selectmenu-form-state-restore.tentative.html": [
-        "1002355a5ab1ea4718ad2194826dac743ea7ec85",
+       "selectlist-form-state-restore.tentative.html": [
+        "f98494a950719ef94d8b91f525659cb68682d813",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-form-submission.tentative.html": [
-        "75a2b17e9037a5c531577e8593b5d808750b9e0c",
+       "selectlist-form-submission.tentative.html": [
+        "4b5e4970287b4df5bfd0c516f0e116fe68ddd77d",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-keyboard.tentative.html": [
-        "9f937d7b7004e15e1ab74c04ae9b7a98afbdfa17",
+       "selectlist-keyboard.tentative.html": [
+        "38c5fd7dc4ed95c7f5a49b7e14e696490ae5ebfa",
         [
          null,
          {
@@ -630003,15 +631362,15 @@
          }
         ]
        ],
-       "selectmenu-labels.tentative.html": [
-        "6f94043299932979c81b71aac75dc1ce4fde15d3",
+       "selectlist-labels.tentative.html": [
+        "819da49fdd4137760bba7cbb3d1e87ef1c595edc",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-many-options.tentative.html": [
-        "b828326197b6363b481f970c5e4cdec22f26b445",
+       "selectlist-many-options.tentative.html": [
+        "36bae1a82baec56402a783c8a84fa65350ab4057",
         [
          null,
          {
@@ -630019,8 +631378,8 @@
          }
         ]
        ],
-       "selectmenu-nested.tentative.html": [
-        "06b4fb6eb248f4a962803387b5b842e6e21e08e8",
+       "selectlist-nested.tentative.html": [
+        "1d15fb90160f3d02478b8780af8d1f786890ccad",
         [
          null,
          {
@@ -630028,8 +631387,8 @@
          }
         ]
        ],
-       "selectmenu-option-focusable.tentative.html": [
-        "a78b972a2a7b4e599be4c2c292450b87c9fdbe95",
+       "selectlist-option-focusable.tentative.html": [
+        "993ef007e683052ec86d613a98d1a1b68f3e58f0",
         [
          null,
          {
@@ -630037,8 +631396,8 @@
          }
         ]
        ],
-       "selectmenu-parts-structure.tentative.html": [
-        "08c283322d54a3173c872cb9386a85f3197514b7",
+       "selectlist-parts-structure.tentative.html": [
+        "f60ba65be17d181699b654f1a15db9c7bf4ab854",
         [
          null,
          {
@@ -630046,8 +631405,8 @@
          }
         ]
        ],
-       "selectmenu-popover-position-with-zoom.tentative.html": [
-        "85d73d6a407bfdb7f9e9e929491afb24e8ed48c6",
+       "selectlist-popover-position-with-zoom.tentative.html": [
+        "2f61af1a11f73ce74e470a06d43572c07277d1d8",
         [
          null,
          {
@@ -630055,8 +631414,8 @@
          }
         ]
        ],
-       "selectmenu-popover-position.tentative.html": [
-        "d83015f4efdabeb0ed496f7ff0a63a928497ffba",
+       "selectlist-popover-position.tentative.html": [
+        "a19e2b0d282deff96436c46d6c52f87135152c72",
         [
          null,
          {
@@ -630064,8 +631423,8 @@
          }
         ]
        ],
-       "selectmenu-popover.tentative.html": [
-        "74aa4f828c3410aad4af2a7b2815fd14a1fc7ad3",
+       "selectlist-popover.tentative.html": [
+        "b7663875ce0643e2176676268ca056fe4b1ce9a9",
         [
          null,
          {
@@ -630073,8 +631432,8 @@
          }
         ]
        ],
-       "selectmenu-pseudo-light-dismiss-invalidation.tentative.html": [
-        "dfbab93de8236fbf8641e04773c693f6e517d325",
+       "selectlist-pseudo-light-dismiss-invalidation.tentative.html": [
+        "bda5842a37c4bdd8484a39ec0b10b6ed63384816",
         [
          null,
          {
@@ -630082,22 +631441,22 @@
          }
         ]
        ],
-       "selectmenu-pseudo-open-closed.tentative.html": [
-        "b1400e04265128ab3213a05a22de69ed106b2ac7",
+       "selectlist-pseudo-open-closed.tentative.html": [
+        "3184fe786c1944a6cf3f4df298d1b9e6f52c34fe",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-required-attribute.tentative.html": [
-        "ea6d1b215d721a3ebff22c965dd92c98fe8fb67e",
+       "selectlist-required-attribute.tentative.html": [
+        "ef4408915b32431e66fb121d90a06ac9a98520c2",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-tab-navigation.tentative.html": [
-        "3d583335ed1e51016cbffb6576bcbee67ee96bb4",
+       "selectlist-tab-navigation.tentative.html": [
+        "3b7d9d3d9ada9aee6f4227572450774b347a5b34",
         [
          null,
          {
@@ -630105,8 +631464,8 @@
          }
         ]
        ],
-       "selectmenu-tabindex-order.tentative.html": [
-        "b4fa2a1e757f2c8eac1b5251e825bf08261412fc",
+       "selectlist-tabindex-order.tentative.html": [
+        "c93efe1118e16bf2383512b467b84326952402c7",
         [
          null,
          {
@@ -630114,29 +631473,29 @@
          }
         ]
        ],
-       "selectmenu-user-select.tentative.html": [
-        "dc6e2e230c04861fb9b931eed4d78bea501fa5e7",
+       "selectlist-user-select.tentative.html": [
+        "078e8a4d83c0d05f9c0b149760edbf145d2d4328",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-validity.tentative.html": [
-        "a58fe54ff6a28b33574996db863f7cbd20c31b8f",
+       "selectlist-validity.tentative.html": [
+        "2b2033f668856b1d3475b303e37631cb0a8bab0c",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-value-option.tentative.html": [
-        "bf58630816addcb025ad7ac4e59c5ccfe16aa74f",
+       "selectlist-value-option.tentative.html": [
+        "243067937cb981d2564125c0fa8d08083cde1f3b",
         [
          null,
          {}
         ]
        ],
-       "selectmenu-value-selectedOption.tentative.html": [
-        "8998a07e03c5fdfe577c486968d1d71875d09fdb",
+       "selectlist-value-selectedOption.tentative.html": [
+        "20e72ac1dcb5549cb3c08a62652a14e99486111a",
         [
          null,
          {}
@@ -630483,15 +631842,6 @@
          {}
         ]
        ],
-       "dialog-cancel-events-closewatcher.tentative.html": [
-        "5b1da9a2e37811e389e60ddbc358fa99e89817a6",
-        [
-         null,
-         {
-          "testdriver": true
-         }
-        ]
-       ],
        "dialog-cancel-events.html": [
         "7133ce3ca04ec4c874e93a618ecf0e72065e7fd5",
         [
@@ -630501,15 +631851,6 @@
          }
         ]
        ],
-       "dialog-cancel-preventDefault-closewatcher.tentative.html": [
-        "ef99578ca97dfa2f6ad48d577133b2ab6bf4157b",
-        [
-         null,
-         {
-          "testdriver": true
-         }
-        ]
-       ],
        "dialog-cancel-preventDefault.html": [
         "79728b649f4f4a2ca5948b3857678cab762f7927",
         [
@@ -652970,7 +654311,7 @@
       ]
      ],
      "navigate-navigation-back-same-document.html": [
-      "431d38449c3dff316911bd17b7260f164160f20b",
+      "e587569a3c61065989d4cf48834f47b87af57584",
       [
        null,
        {}
@@ -674413,7 +675754,7 @@
      ]
     ],
     "callback-idle-periods.html": [
-     "3c2de61bfeadd452ea1a80d30c42a799704ab1b3",
+     "f515755e353787ca9f583de39d7a9abee21e2629",
      [
       null,
       {
@@ -678592,7 +679933,7 @@
       ]
      ],
      "scroll-timeline-invalidation.html": [
-      "cf5e74898afa5f507c50439c501507da80749f5f",
+      "a26500989ed0c64ca715f94f120b79ee19f45bd7",
       [
        null,
        {}
@@ -678700,6 +680041,13 @@
        {}
       ]
      ],
+     "contain-alignment.html": [
+      "8b61a9ab81ca46aa2c1530e00a7332fc70bf05cb",
+      [
+       null,
+       {}
+      ]
+     ],
      "get-keyframes-with-timeline-offset.html": [
       "02f910d04e3316feaaa3512101d12bc9dcfa40f5",
       [
@@ -702414,7 +703762,7 @@
       ]
      ],
      "fallback-roles.html": [
-      "6f42fa693e55eb37f8d014bc2c9001c1a5bcbb72",
+      "98011570b4f074bf23871a91f404e74ea6001674",
       [
        null,
        {
@@ -702431,6 +703779,15 @@
        }
       ]
      ],
+     "grid-roles.html": [
+      "d26af5d76fda6df7c3d407e5b3ee355627d2dc54",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "invalid-roles.html": [
       "da2370583a2267cb078e1ecda4fe3b57905acd76",
       [
@@ -709192,7 +710549,7 @@
        ]
       ],
       "audiocontext-suspend-resume-close.html": [
-       "ea93cab96a63e114d8b6399d22278a8f2b945039",
+       "c011f336df4424bd0ba00180dbe27d8b58d44c3f",
        [
         null,
         {}
@@ -713725,7 +715082,7 @@
      ]
     ],
     "video-decoder.https.any.js": [
-     "3c4ca479ce40134f3ccb4c843b5859c19851f575",
+     "c68315261fbad85f8e204290d966ccc7f02ac95b",
      [
       "webcodecs/video-decoder.https.any.html",
       {
@@ -718748,7 +720105,7 @@
      ]
     ],
     "RTCPeerConnection-removeTrack.https.html": [
-     "83095c085a8b20512b5173b2d36c9842122fc4cc",
+     "d0229a4c6c62c70fa80fc4e794c1faafecb09f8d",
      [
       null,
       {}
@@ -719021,7 +720378,7 @@
      ]
     ],
     "RTCRtpSender-replaceTrack.https.html": [
-     "bec44c53e467102fe55b86ab450c97c295213c99",
+     "34f8573755824ea5e9882fcae0bc8a958a278974",
      [
       null,
       {
@@ -719030,7 +720387,7 @@
      ]
     ],
     "RTCRtpSender-setParameters.html": [
-     "94c572343de711c0535332cf89131fd2e117c8c8",
+     "7c8740dd1dd42c6546d315eb496e9562470f6d48",
      [
       null,
       {}
@@ -719081,7 +720438,7 @@
      ]
     ],
     "RTCRtpTransceiver-stopping.https.html": [
-     "16be25fe138b788d6365e3af1a21a3db72728d7f",
+     "e085be6d3cfff43a2366838bcf076c6b3bacf1d3",
      [
       null,
       {}
diff --git a/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 2c180891ceb..beb199e6c0f 100644
--- a/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/meta/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -40,3 +40,6 @@
 
   [[data-expected-height\] 4]
     expected: FAIL
+
+  [[data-expected-height\] 2]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-001.html.ini b/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-001.html.ini
new file mode 100644
index 00000000000..e755631d21c
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-001.html.ini
@@ -0,0 +1,2 @@
+[cssbox-content-box-001.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-002.html.ini b/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-002.html.ini
new file mode 100644
index 00000000000..d6a7f222bb7
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box-002.html.ini
@@ -0,0 +1,2 @@
+[cssbox-content-box-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box.html.ini b/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box.html.ini
deleted file mode 100644
index 39281adef09..00000000000
--- a/tests/wpt/meta/css/css-transforms/transform-box/cssbox-content-box.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cssbox-content-box.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-variables/wide-keyword-fallback-002.html.ini b/tests/wpt/meta/css/css-variables/wide-keyword-fallback-002.html.ini
new file mode 100644
index 00000000000..2591556c763
--- /dev/null
+++ b/tests/wpt/meta/css/css-variables/wide-keyword-fallback-002.html.ini
@@ -0,0 +1,2 @@
+[wide-keyword-fallback-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini
deleted file mode 100644
index 2a4020ad11a..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[selectmenu-ask-for-reset.html]
-  [ask-for-reset when removing option]
-    expected: FAIL
-
-  [ask-for-reset when inserting option]
-    expected: FAIL
-
-  [ask-for-reset when changing selectedness of option]
-    expected: FAIL
-
-  [ask-for-reset for form]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini
deleted file mode 100644
index 71b1e100f59..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html.ini
+++ /dev/null
@@ -1,42 +0,0 @@
-[selectmenu-form-attribute.tentative.html]
-  [[SELECTMENU\] Basic form association - control with no form attribute is associated with ancestor]
-    expected: FAIL
-
-  [[SELECTMENU\] Form owner is reset to null when control's form attribute is set to an ID that does not exist in the document]
-    expected: FAIL
-
-  [[SELECTMENU\] Control whose form attribute is an empty string has no form owner]
-    expected: FAIL
-
-  [[SELECTMENU\] Control whose form attribute is an empty string has no form owner even when form with empty attribute is present]
-    expected: FAIL
-
-  [[SELECTMENU\] Control's form attribute must be a case sensitive match for the form's id]
-    expected: FAIL
-
-  [[SELECTMENU\] Setting the form attribute of a control to the id of a non-ancestor form works]
-    expected: FAIL
-
-  [[SELECTMENU\] Removing form id from a control resets the form owner to ancestor]
-    expected: FAIL
-
-  [[SELECTMENU\] Removing the form owner of a control with form attribute resets the form owner to null]
-    expected: FAIL
-
-  [[SELECTMENU\] Changing form attibute of control resets form owner to correct form]
-    expected: FAIL
-
-  [[SELECTMENU\] Moving a control with form attribute within the document does not change the form owner]
-    expected: FAIL
-
-  [[SELECTMENU\] When the id of a non-ancestor form changes from not being a match for the form attribute to being a match, the control's form owner is reset]
-    expected: FAIL
-
-  [[SELECTMENU\] When form element with same ID as the control's form attribute is inserted earlier in tree order, the form owner is changed to the inserted form]
-    expected: FAIL
-
-  [[SELECTMENU\] When non-form element with same ID as the control's form attribute is inserted earlier in tree order, the control does not have a form owner]
-    expected: FAIL
-
-  [[SELECTMENU\] A control that is not in the document but has the form attribute set is associated with the nearest ancestor form if one exists]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
deleted file mode 100644
index 0915c8addad..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selectmenu-form-state-restore.tentative.html]
-  [Test restoring state after form submission]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini
deleted file mode 100644
index 8118ccaedb4..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[selectmenu-form-submission.tentative.html]
-  [Test that HTMLSelectMenu.value is used for form submission]
-    expected: FAIL
-
-  [Test that HTMLSelectMenu.value is not used for form submission without name attribute]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini
deleted file mode 100644
index 0105e74004d..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selectmenu-labels.tentative.html]
-  [Validate selectmenu.labels]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini
deleted file mode 100644
index 639f36162aa..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-option-arbitrary-content-displayed.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini
deleted file mode 100644
index 58fdfdacab4..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-option-arbitrary-content-not-displayed.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini
deleted file mode 100644
index 20d7563d7a1..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[selectmenu-pseudo-open-closed.tentative.html]
-  [Selectmenu should support :open and :closed pseudo selectors.]
-    expected: FAIL
-
-  [Selectmenu :open and :closed should invalidate correctly.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini
deleted file mode 100644
index 16cf2b2a871..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selectmenu-required-attribute.tentative.html]
-  [Test required attribute]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini
deleted file mode 100644
index f0b90e82c56..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[selectmenu-validity.tentative.html]
-  [Validation for placeholder option]
-    expected: FAIL
-
-  [Check form not submitted for invalid selectmenu]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini
deleted file mode 100644
index 693bd4e2994..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[selectmenu-value-option.tentative.html]
-  [selectmenu.value should reflect option.value]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini
deleted file mode 100644
index c14c5aa877d..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-[selectmenu-value-selectedOption.tentative.html]
-  [Test that HTMLSelectMenu with no options has empty string for value and null for selectedOption]
-    expected: FAIL
-
-  [Test value and selectedOption with HTMLOptionElement element option parts]
-    expected: FAIL
-
-  [Test value with non-HTMLOptionElement elements labeled as parts]
-    expected: FAIL
-
-  [Test that value and selectedOption are updated when options are removed]
-    expected: FAIL
-
-  [Test that slotted-in selected-value part is updated to value of selectmenu]
-    expected: FAIL
-
-  [Test that option parts in a slotted-in listbox are reflected in the value property]
-    expected: FAIL
-
-  [Test that value and selectedOption are correctly updated]
-    expected: FAIL
-
-  [Test that HTMLOption.selected updates selectmenu.value and selectmenu.selectedOption]
-    expected: FAIL
-
-  [Test that HTMLOption.value updates selectmenu.value]
-    expected: FAIL
-
-  [Test value and selectedOption when value is null]
-    expected: FAIL
-
-  [Test value and selectedOption when value is undefined]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini
deleted file mode 100644
index c571a62dbd7..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-writingmode-lr.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini
deleted file mode 100644
index 4359e0d6770..00000000000
--- a/tests/wpt/meta/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[selectmenu-writingmode-rl.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/tests/accessibility/crashtests/displaylocked-serialize.html b/tests/wpt/tests/accessibility/crashtests/displaylocked-serialize.html
index 76784291b44..04be6ddf71a 100644
--- a/tests/wpt/tests/accessibility/crashtests/displaylocked-serialize.html
+++ b/tests/wpt/tests/accessibility/crashtests/displaylocked-serialize.html
@@ -2,13 +2,13 @@
 <link rel=author href="mailto:jarhar@chromium.org">
 <link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1291169">
 
-<selectmenu></selectmenu>
+<selectlist></selectlist>
 <div></div>
 
 <script>
   (async () => {
-    const selectmenu = document.querySelector('selectmenu');
+    const selectlist = document.querySelector('selectlist');
     await getComputedAccessibleNode(document.querySelector('div'));
-    selectmenu.style.setProperty('content-visibility', 'hidden');
+    selectlist.style.setProperty('content-visibility', 'hidden');
   })();
 </script>
diff --git a/tests/wpt/tests/accname/META.yml b/tests/wpt/tests/accname/META.yml
index 81588fba456..7f538628e8c 100644
--- a/tests/wpt/tests/accname/META.yml
+++ b/tests/wpt/tests/accname/META.yml
@@ -3,5 +3,4 @@ suggested_reviewers:
   - cookiecrook
   - spectranaut
   - jnurthen
-  - halindrome
-  - joanmarie
+  - melsumner
diff --git a/tests/wpt/tests/close-watcher/closewatcher-dialog-popover.html b/tests/wpt/tests/close-watcher/closewatcher-dialog-popover.html
new file mode 100644
index 00000000000..f6443c4317e
--- /dev/null
+++ b/tests/wpt/tests/close-watcher/closewatcher-dialog-popover.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/pull/9462">
+<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/helpers.js"></script>
+
+<button id=b0>button</button>
+
+<dialog id=dialog>
+  <button id=b1>button</button>
+  <div id=popover popover=auto>popover</div>
+</dialog>
+
+<script>
+const waitForPotentialCloseEvent = () => {
+  // CloseWatchers fire close events synchronously, but dialog elements wait
+  // for a rAF before firing them.
+  return new Promise(resolve => requestAnimationFrame(resolve));
+};
+
+promise_test(async t => {
+  const events = [];
+  const closeWatcher = createRecordingCloseWatcher(t, events, 'CloseWatcher', 'CloseWatcher');
+  const dialog = createRecordingCloseWatcher(t, events, 'dialog', 'dialog');
+  const popover = createRecordingCloseWatcher(t, events, 'popover', 'popover');
+  assert_true(dialog.hasAttribute('open'), 'The dialog should be open.');
+  assert_true(popover.matches(':popover-open'), 'The popover should be open.');
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+
+  assert_false(popover.matches(':popover-open'), 'The popover should be closed.');
+  assert_false(dialog.hasAttribute('open'), 'The dialog should be closed.');
+  assert_array_equals(events, ['CloseWatcher close', 'dialog close']);
+}, 'Opening a CloseWatcher, modal dialog, and popover without user activation causes them all to be closed with one close request.');
+
+promise_test(async t => {
+  const events = [];
+  const closeWatcher = await createBlessedRecordingCloseWatcher(t, events, 'CloseWatcher', 'CloseWatcher');
+  const dialog = await createBlessedRecordingCloseWatcher(t, events, 'dialog', 'dialog');
+  const popover = await createBlessedRecordingCloseWatcher(t, events, 'popover', 'popover', dialog);
+  assert_true(dialog.hasAttribute('open'), 'The dialog should be open.');
+  assert_true(popover.matches(':popover-open'), 'The popover should be open.');
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_false(popover.matches(':popover-open'), 'First close request: The popover should be closed.');
+  assert_true(dialog.hasAttribute('open'), 'First close request: The dialog should be open.');
+  assert_array_equals(events, []);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_false(popover.matches(':popover-open'), 'Second close request: The popover should be closed.');
+  assert_false(dialog.hasAttribute('open'), 'Second close request: The dialog should be closed.');
+  assert_array_equals(events, ['dialog close']);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_false(popover.matches(':popover-open'), 'Third close request: The popover should be closed.');
+  assert_false(dialog.hasAttribute('open'), 'Third close request: The dialog should be closed.');
+  assert_array_equals(events, ['dialog close', 'CloseWatcher close']);
+}, 'Opening a CloseWatcher, modal dialog, and popover with user activation for each should close one at a time with close requests.');
+
+promise_test(async t => {
+  const events = [];
+  const closeWatcher = await createBlessedRecordingCloseWatcher(t, events, 'CloseWatcher', 'CloseWatcher');
+  const dialog = await createBlessedRecordingCloseWatcher(t, events, 'dialog', 'dialog');
+  const popover = await createBlessedRecordingCloseWatcher(t, events, 'popover', 'popover', dialog);
+  assert_true(dialog.hasAttribute('open'), 'The dialog should be open.');
+  assert_true(popover.matches(':popover-open'), 'The popover should be open.');
+
+  await dialogResilientBless(popover, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+  assert_false(popover.matches(':popover-open'), 'First close request: The popover should be closed.');
+  assert_true(dialog.hasAttribute('open'), 'First close request: The dialog should be open.');
+  assert_array_equals(events, []);
+
+  await dialogResilientBless(dialog, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+  assert_false(popover.matches(':popover-open'), 'Second close request: The popover should be closed.');
+  assert_false(dialog.hasAttribute('open'), 'Second close request: The dialog should be closed.');
+  assert_array_equals(events, ['dialog cancel', 'dialog close']);
+
+  await dialogResilientBless(closeWatcher, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+  assert_false(popover.matches(':popover-open'), 'Third close request: The popover should be closed.');
+  assert_false(dialog.hasAttribute('open'), 'Third close request: The dialog should be closed.');
+  assert_array_equals(events, ['dialog cancel', 'dialog close', 'CloseWatcher cancel', 'CloseWatcher close']);
+}, 'Opening a CloseWatcher, modal dialog, and popover with user activation for each and sending close requests with user activation should close one at a time and have cancel events.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html b/tests/wpt/tests/close-watcher/dialog-cancel-events-closewatcher.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-events-closewatcher.tentative.html
rename to tests/wpt/tests/close-watcher/dialog-cancel-events-closewatcher.html
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html b/tests/wpt/tests/close-watcher/dialog-cancel-preventDefault-closewatcher.html
similarity index 100%
rename from tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-cancel-preventDefault-closewatcher.tentative.html
rename to tests/wpt/tests/close-watcher/dialog-cancel-preventDefault-closewatcher.html
diff --git a/tests/wpt/tests/close-watcher/resources/helpers.js b/tests/wpt/tests/close-watcher/resources/helpers.js
index de643365692..c4c8c5b0326 100644
--- a/tests/wpt/tests/close-watcher/resources/helpers.js
+++ b/tests/wpt/tests/close-watcher/resources/helpers.js
@@ -1,16 +1,40 @@
-window.createRecordingCloseWatcher = (t, events, name) => {
-  const prefix = name === undefined ? "" : name + " ";;
+window.createRecordingCloseWatcher = (t, events, name, type, parent) => {
+  let watcher = null;
+  if (type === 'dialog') {
+    watcher = document.createElement('dialog');
+    watcher.textContent = 'hello world';
+    t.add_cleanup(() => watcher.remove());
+    if (parent) {
+      parent.appendChild(watcher);
+    } else {
+      document.body.appendChild(watcher);
+    }
+    watcher.showModal();
+  } else if (type === 'popover') {
+    watcher = document.createElement('div');
+    watcher.setAttribute('popover', 'auto');
+    watcher.textContent = 'hello world';
+    t.add_cleanup(() => watcher.remove());
+    if (parent) {
+      parent.appendChild(watcher);
+    } else {
+      document.body.appendChild(watcher);
+    }
+    watcher.showPopover();
+  } else {
+    watcher = new CloseWatcher();
+    t.add_cleanup(() => watcher.destroy());
+  }
 
-  const watcher = new CloseWatcher();
-  t.add_cleanup(() => watcher.destroy());
-  watcher.addEventListener("cancel", () => events.push(prefix + "cancel"));
-  watcher.addEventListener("close", () => events.push(prefix + "close"));
+  const prefix = name === undefined ? "" : name + " ";
+  watcher.addEventListener('cancel', () => events.push(prefix + "cancel"));
+  watcher.addEventListener('close', () => events.push(prefix + "close"));
 
   return watcher;
 };
 
-window.createBlessedRecordingCloseWatcher = (t, events, name) => {
-  return test_driver.bless("create " + name, () => createRecordingCloseWatcher(t, events, name));
+window.createBlessedRecordingCloseWatcher = async (t, events, name, type, dialog) => {
+  return dialogResilientBless(dialog, () => createRecordingCloseWatcher(t, events, name, type, dialog));
 };
 
 window.sendEscKey = () => {
@@ -27,3 +51,21 @@ window.sendEscKey = () => {
 // with different close requests. In that case, we'd update this
 // function, but not update the sendEscKey function above.
 window.sendCloseRequest = window.sendEscKey;
+
+// This function is a version of test_driver.bless which works on dialog elements:
+// https://github.com/web-platform-tests/wpt/issues/41218
+window.dialogResilientBless = async (watcher, fn) => {
+  if (watcher instanceof HTMLElement) {
+    const button = document.createElement('button');
+    watcher.appendChild(button);
+    await test_driver.click(button);
+    button.remove();
+    if (typeof fn === 'function') {
+      return fn();
+    } else {
+      return null;
+    }
+  } else {
+    return await test_driver.bless('dialogResilientBless', fn);
+  }
+};
diff --git a/tests/wpt/tests/close-watcher/user-activation-CloseWatcher.html b/tests/wpt/tests/close-watcher/user-activation-CloseWatcher.html
new file mode 100644
index 00000000000..70435993f54
--- /dev/null
+++ b/tests/wpt/tests/close-watcher/user-activation-CloseWatcher.html
@@ -0,0 +1,75 @@
+<!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="resources/helpers.js"></script>
+
+<!-- The dialog element does not support requestClose(), so these tests
+     are not shared between dialog elements and CloseWatchers. -->
+
+<body>
+<script>
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
+
+  await test_driver.bless("call requestClose()", () => freeWatcher.requestClose());
+
+  assert_array_equals(events, ["freeWatcher cancel", "freeWatcher close"]);
+}, "CloseWatchers created without user activation, but requestClose()d via user activation, fires cancel");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
+  freeWatcher.addEventListener("cancel", e => e.preventDefault());
+
+  await test_driver.bless("call requestClose()", () => freeWatcher.requestClose());
+
+  assert_array_equals(events, ["freeWatcher cancel"]);
+}, "CloseWatchers created without user activation, but requestClose()d via user activation, fires cancel, which can be preventDefault()ed");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
+  const activationWatcher = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher");
+
+  await test_driver.bless("call activationWatcher.requestClose()", () => activationWatcher.requestClose());
+  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close"]);
+
+  await test_driver.bless("call freeWatcher.requestClose()", () => freeWatcher.requestClose());
+  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close", "freeWatcher cancel", "freeWatcher close"]);
+}, "Creating a CloseWatcher from user activation, and requestClose()ing CloseWatchers with user activation, fires cancel");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
+  const activationWatcher1 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1");
+  activationWatcher1.addEventListener("cancel", e => e.preventDefault());
+
+  await test_driver.bless("call activationWatcher1.requestClose()", () => activationWatcher1.requestClose());
+  assert_array_equals(events, ["activationWatcher1 cancel"]);
+
+  // This time we go straight to close, without a second cancel.
+  activationWatcher1.requestClose();
+  assert_array_equals(events, ["activationWatcher1 cancel", "activationWatcher1 close"]);
+
+  freeWatcher.requestClose();
+  assert_array_equals(events, ["activationWatcher1 cancel", "activationWatcher1 close", "freeWatcher close"]);
+}, "3 user activations let you have 2 close watchers with 1 cancel event, even if the first cancel event is prevented");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher1 = createRecordingCloseWatcher(t, events, "freeWatcher1");
+
+  freeWatcher1.requestClose();
+  assert_array_equals(events, ["freeWatcher1 close"]);
+
+  const freeWatcher2 = createRecordingCloseWatcher(t, events, "freeWatcher2");
+
+  await sendCloseRequest();
+  assert_array_equals(events, ["freeWatcher1 close", "freeWatcher2 close"]);
+}, "requestClose()ing the free CloseWatcher allows a new free one to be created without user activation, and it receives the close request");
+
+</script>
diff --git a/tests/wpt/tests/close-watcher/user-activation-shared.html b/tests/wpt/tests/close-watcher/user-activation-shared.html
new file mode 100644
index 00000000000..6ecc2dc694d
--- /dev/null
+++ b/tests/wpt/tests/close-watcher/user-activation-shared.html
@@ -0,0 +1,195 @@
+<!doctype html>
+<meta name=variant content="?dialog">
+<meta name=variant content="?CloseWatcher">
+<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/helpers.js"></script>
+
+<body>
+<script>
+const type = location.search.substring(1);
+const waitForPotentialCloseEvent = () => {
+  // CloseWatchers fire close events synchronously, but dialog elements wait
+  // for a rAF before firing them.
+  return new Promise(resolve => requestAnimationFrame(resolve));
+};
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  freeWatcher.addEventListener("cancel", e => e.preventDefault());
+
+  await dialogResilientBless(freeWatcher, () => freeWatcher.close());
+  await waitForPotentialCloseEvent();
+
+  assert_array_equals(events, ["freeWatcher close"]);
+}, "Close watchers created without user activation, but close()d via user activation, do not fire cancel");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+
+  await dialogResilientBless(freeWatcher, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+
+  assert_array_equals(events, ["freeWatcher cancel", "freeWatcher close"]);
+}, "Close watchers created without user activation, but closed via a close request after user activation, fires cancel");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  freeWatcher.addEventListener("cancel", e => e.preventDefault());
+
+  await dialogResilientBless(freeWatcher, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+
+  assert_array_equals(events, ["freeWatcher cancel"]);
+}, "Close watchers created without user activation, but closed via a close request after user activation, fires cancel, which can be preventDefault()ed");
+
+promise_test(async t => {
+  const events = [];
+  createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  createRecordingCloseWatcher(t, events, "watcher1", type);
+  createRecordingCloseWatcher(t, events, "watcher2", type);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["watcher2 close", "watcher1 close", "freeWatcher close"]);
+}, "Multiple close watchers created without user activation close together (with no cancel)");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher", type, freeWatcher);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["activationWatcher close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["activationWatcher close", "freeWatcher close"]);
+}, "Creating a close watcher from user activation keeps it separate from the free close watcher, but they don't fire cancel");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  const activationWatcher = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher", type, freeWatcher);
+
+  await dialogResilientBless(activationWatcher, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close"]);
+
+  await dialogResilientBless(freeWatcher, () => sendCloseRequest());
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close", "freeWatcher cancel", "freeWatcher close"]);
+}, "Creating a close watcher from user activation, and closing close watchers with a close request after user activation, fires cancel");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  const activationWatcher1 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1", type, freeWatcher);
+  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher2", type, activationWatcher1);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["activationWatcher2 close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["activationWatcher2 close", "activationWatcher1 close"]);
+}, "Multiple close watchers created with user activation close in reverse order");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+  const activationWatcher1 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1", type, freeWatcher);
+  const activationWatcher2 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher2", type, activationWatcher1);
+  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher3", type, activationWatcher2);
+  createRecordingCloseWatcher(t, events, "watcher4", type);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close", "activationWatcher2 close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close", "activationWatcher2 close", "activationWatcher1 close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close", "activationWatcher2 close", "activationWatcher1 close", "freeWatcher close"]);
+}, "3 user activations let you have 3 + 1 = 4 ungrouped close watchers/0 cancel events");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher1 = createRecordingCloseWatcher(t, events, "freeWatcher1", type);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher1 close"]);
+
+  const freeWatcher2 = createRecordingCloseWatcher(t, events, "freeWatcher2", type);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher1 close", "freeWatcher2 close"]);
+}, "closing the free close watcher via a close request allows a new free one to be created without user activation, and it receives a second close request");
+
+promise_test(async t => {
+  const events = [];
+  const activationWatcher = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher", type);
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher close", "activationWatcher close"]);
+}, "The second watcher can be the free watcher, if the first is created with user activation");
+
+promise_test(async t => {
+  const events = [];
+  const activationWatcher1 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1", type);
+  const activationWatcher2 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher2", type, activationWatcher1);
+  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher", type);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher close", "activationWatcher2 close"]);
+
+  await sendCloseRequest();
+  await waitForPotentialCloseEvent();
+  assert_array_equals(events, ["freeWatcher close", "activationWatcher2 close", "activationWatcher1 close"]);
+}, "The third watcher can be the free watcher, if the first two are created with user activation");
+
+promise_test(async t => {
+  const events = [];
+  const freeWatcher1 = createRecordingCloseWatcher(t, events, "freeWatcher1");
+
+  if (freeWatcher1 instanceof HTMLDialogElement) {
+    freeWatcher1.close();
+  } else {
+    freeWatcher1.destroy();
+  }
+  assert_array_equals(events, []);
+
+  const freeWatcher2 = createRecordingCloseWatcher(t, events, "freeWatcher2");
+
+  await sendCloseRequest();
+  assert_array_equals(events, ["freeWatcher2 close"]);
+}, "destroy()ing the free close watcher allows a new free one to be created without user activation, and it receives the close request");
+</script>
diff --git a/tests/wpt/tests/close-watcher/user-activation.html b/tests/wpt/tests/close-watcher/user-activation.html
deleted file mode 100644
index 4591f5493b2..00000000000
--- a/tests/wpt/tests/close-watcher/user-activation.html
+++ /dev/null
@@ -1,222 +0,0 @@
-<!doctype html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="resources/helpers.js"></script>
-
-<body>
-<script>
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-
-  await test_driver.bless("call requestClose()", () => freeWatcher.requestClose());
-
-  assert_array_equals(events, ["freeWatcher cancel", "freeWatcher close"]);
-}, "CloseWatchers created without user activation, but requestClose()d via user activation, fires cancel");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-  freeWatcher.addEventListener("cancel", e => e.preventDefault());
-
-  await test_driver.bless("call requestClose()", () => freeWatcher.requestClose());
-
-  assert_array_equals(events, ["freeWatcher cancel"]);
-}, "CloseWatchers created without user activation, but requestClose()d via user activation, fires cancel, which can be preventDefault()ed");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-  freeWatcher.addEventListener("cancel", e => e.preventDefault());
-
-  await test_driver.bless("call close()", () => freeWatcher.close());
-
-  assert_array_equals(events, ["freeWatcher close"]);
-}, "CloseWatchers created without user activation, but close()d via user activation, do not fire cancel");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-
-  await test_driver.bless("grant user activation", () => sendCloseRequest());
-
-  assert_array_equals(events, ["freeWatcher cancel", "freeWatcher close"]);
-}, "CloseWatchers created without user activation, but closed via a close request after user activation, fires cancel");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-  freeWatcher.addEventListener("cancel", e => e.preventDefault());
-
-  await test_driver.bless("grant user activation", () => sendCloseRequest());
-
-  assert_array_equals(events, ["freeWatcher cancel"]);
-}, "CloseWatchers created without user activation, but closed via a close request after user activation, fires cancel, which can be preventDefault()ed");
-
-promise_test(async t => {
-  const events = [];
-  createRecordingCloseWatcher(t, events, "freeWatcher");
-  createRecordingCloseWatcher(t, events, "watcher1");
-  createRecordingCloseWatcher(t, events, "watcher2");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["watcher2 close", "watcher1 close", "freeWatcher close"]);
-}, "Multiple CloseWatchers created without user activation close together (with no cancel)");
-
-promise_test(async t => {
-  const events = [];
-  createRecordingCloseWatcher(t, events, "freeWatcher");
-  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["activationWatcher close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["activationWatcher close", "freeWatcher close"]);
-}, "Creating a CloseWatcher from user activation keeps it separate from the free CloseWatcher, but they don't fire cancel");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-  const activationWatcher = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher");
-
-  await test_driver.bless("call activationWatcher.requestClose()", () => activationWatcher.requestClose());
-  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close"]);
-
-  await test_driver.bless("call freeWatcher.requestClose()", () => freeWatcher.requestClose());
-  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close", "freeWatcher cancel", "freeWatcher close"]);
-}, "Creating a CloseWatcher from user activation, and requestClose()ing CloseWatchers with user activation, fires cancel");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-  const activationWatcher = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher");
-
-  await test_driver.bless("grant user activation", () => sendCloseRequest());
-  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close"]);
-
-  await test_driver.bless("grant user activation", () => sendCloseRequest());
-  assert_array_equals(events, ["activationWatcher cancel", "activationWatcher close", "freeWatcher cancel", "freeWatcher close"]);
-}, "Creating a CloseWatcher from user activation, and closing CloseWatchers with a close request after user activation, fires cancel");
-
-promise_test(async t => {
-  const events = [];
-  createRecordingCloseWatcher(t, events, "freeWatcher");
-  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1");
-  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher2");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["activationWatcher2 close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["activationWatcher2 close", "activationWatcher1 close"]);
-}, "Multiple CloseWatchers created with user activation close in reverse order");
-
-promise_test(async t => {
-  const events = [];
-  createRecordingCloseWatcher(t, events, "freeWatcher");
-  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1");
-  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher2");
-  await createBlessedRecordingCloseWatcher(t, events, "activationWatcher3");
-  createRecordingCloseWatcher(t, events, "watcher4");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close", "activationWatcher2 close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close", "activationWatcher2 close", "activationWatcher1 close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["watcher4 close", "activationWatcher3 close", "activationWatcher2 close", "activationWatcher1 close", "freeWatcher close"]);
-}, "3 user activations let you have 3 + 1 = 4 ungrouped close watchers/0 cancel events");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-  const activationWatcher1 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1");
-  activationWatcher1.addEventListener("cancel", e => e.preventDefault());
-
-  await test_driver.bless("call activationWatcher1.requestClose()", () => activationWatcher1.requestClose());
-  assert_array_equals(events, ["activationWatcher1 cancel"]);
-
-  // This time we go straight to close, without a second cancel.
-  activationWatcher1.requestClose();
-  assert_array_equals(events, ["activationWatcher1 cancel", "activationWatcher1 close"]);
-
-  freeWatcher.requestClose();
-  assert_array_equals(events, ["activationWatcher1 cancel", "activationWatcher1 close", "freeWatcher close"]);
-}, "3 user activations let you have 2 close watchers with 1 cancel event, even if the first cancel event is prevented");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher1 = createRecordingCloseWatcher(t, events, "freeWatcher1");
-
-  freeWatcher1.destroy();
-  assert_array_equals(events, []);
-
-  const freeWatcher2 = createRecordingCloseWatcher(t, events, "freeWatcher2");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher2 close"]);
-}, "destroy()ing the free CloseWatcher allows a new free one to be created without user activation, and it receives the close request");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher1 = createRecordingCloseWatcher(t, events, "freeWatcher1");
-
-  freeWatcher1.requestClose();
-  assert_array_equals(events, ["freeWatcher1 close"]);
-
-  const freeWatcher2 = createRecordingCloseWatcher(t, events, "freeWatcher2");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher1 close", "freeWatcher2 close"]);
-}, "requestClose()ing the free CloseWatcher allows a new free one to be created without user activation, and it receives the close request");
-
-promise_test(async t => {
-  const events = [];
-  const freeWatcher1 = createRecordingCloseWatcher(t, events, "freeWatcher1");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher1 close"]);
-
-  const freeWatcher2 = createRecordingCloseWatcher(t, events, "freeWatcher2");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher1 close", "freeWatcher2 close"]);
-}, "closing the free CloseWatcher via a close request allows a new free one to be created without user activation, and it receives a second close request");
-
-promise_test(async t => {
-  const events = [];
-  const activationWatcher = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher");
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher close", "activationWatcher close"]);
-}, "The second watcher can be the free watcher, if the first is created with user activation");
-
-promise_test(async t => {
-  const events = [];
-  const activationWatcher1 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher1");
-  const activationWatcher2 = await createBlessedRecordingCloseWatcher(t, events, "activationWatcher2");
-  const freeWatcher = createRecordingCloseWatcher(t, events, "freeWatcher");
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher close", "activationWatcher2 close"]);
-
-  await sendCloseRequest();
-  assert_array_equals(events, ["freeWatcher close", "activationWatcher2 close", "activationWatcher1 close"]);
-}, "The third watcher can be the free watcher, if the first two are created with user activation");
-</script>
diff --git a/tests/wpt/tests/core-aam/META.yml b/tests/wpt/tests/core-aam/META.yml
index d2e6c9a0486..a976c16dabc 100644
--- a/tests/wpt/tests/core-aam/META.yml
+++ b/tests/wpt/tests/core-aam/META.yml
@@ -3,3 +3,4 @@ suggested_reviewers:
   - jnurthen
   - joanmarie
   - michael-n-cooper
+  - spectranaut
diff --git a/tests/wpt/tests/credential-management/fedcm-not-observer-by-service-worker.https.html b/tests/wpt/tests/credential-management/fedcm-not-observed-by-service-worker.https.html
similarity index 100%
rename from tests/wpt/tests/credential-management/fedcm-not-observer-by-service-worker.https.html
rename to tests/wpt/tests/credential-management/fedcm-not-observed-by-service-worker.https.html
diff --git a/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js b/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js
index 0acb84010b1..2e8f8066817 100644
--- a/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js
+++ b/tests/wpt/tests/credential-management/support/fedcm-helper.sub.js
@@ -1,5 +1,21 @@
+const manifest_origin = "https://{{host}}:{{ports[https][0]}}";
 export const alt_manifest_origin = 'https://{{hosts[alt][]}}:{{ports[https][0]}}';
 
+function open_and_wait_for_popup(origin, path, resolve) {
+  let popup_window = window.open(origin + path);
+
+  // We rely on the popup page to send us a message when done.
+  const popup_message_handler = (event) => {
+    if (event.origin == origin) {
+      popup_window.close();
+      window.removeEventListener('message', popup_message_handler);
+      resolve();
+    }
+  };
+
+  window.addEventListener('message', popup_message_handler);
+}
+
 // Set the identity provider cookie.
 export function set_fedcm_cookie(host) {
   return new Promise(resolve => {
@@ -7,17 +23,7 @@ export function set_fedcm_cookie(host) {
       document.cookie = 'cookie=1; SameSite=Strict; Path=/credential-management/support; Secure';
       resolve();
     } else {
-      let popup_window = window.open(host + '/credential-management/support/set_cookie');
-
-      const popup_message_handler = (event) => {
-        if (event.origin == host) {
-          popup_window.close();
-          window.removeEventListener('message', popup_message_handler);
-          resolve();
-        }
-      };
-
-      window.addEventListener('message', popup_message_handler);
+      open_and_wait_for_popup(host, '/credential-management/support/set_cookie', resolve);
     }
   });
 }
@@ -27,13 +33,19 @@ export function set_alt_fedcm_cookie() {
   return set_fedcm_cookie(alt_manifest_origin);
 }
 
+export function mark_signed_in(origin = manifest_origin) {
+  return new Promise(resolve => {
+    open_and_wait_for_popup(origin, '/credential-management/support/mark_signedin', resolve);
+  });
+}
+
 // Returns FedCM CredentialRequestOptions for which navigator.credentials.get()
 // succeeds.
 export function request_options_with_mediation_required(manifest_filename) {
   if (manifest_filename === undefined) {
     manifest_filename = "manifest.py";
   }
-  const manifest_path = `https://{{host}}:{{ports[https][0]}}/\
+  const manifest_path = `${manifest_origin}/\
 credential-management/support/fedcm/${manifest_filename}`;
   return {
     identity: {
@@ -113,7 +125,7 @@ function select_manifest_impl(manifest_url) {
 
   return new Promise(resolve => {
     const img = document.createElement('img');
-    img.src = `support/fedcm/select_manifest_in_root_manifest.py${url_query}`;
+    img.src = `/credential-management/support/fedcm/select_manifest_in_root_manifest.py${url_query}`;
     img.addEventListener('error', resolve);
     document.body.appendChild(img);
   });
@@ -138,6 +150,22 @@ export function request_options_with_login_hint(manifest_filename, login_hint) {
   return options;
 }
 
+export function fedcm_get_dialog_type_promise(t) {
+  return new Promise(resolve => {
+    async function helper() {
+      // Try to get the dialog type. If the UI is not up yet, we'll catch an exception
+      // and try again in 100ms.
+      try {
+        const type = await window.test_driver.get_fedcm_dialog_type();
+        resolve(type);
+      } catch (ex) {
+        t.step_timeout(helper, 100);
+      }
+    }
+    helper();
+  });
+}
+
 export function fedcm_get_title_promise(t) {
   return new Promise(resolve => {
     async function helper() {
diff --git a/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json
new file mode 100644
index 00000000000..ad3f295ea85
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/fedcm/manifest_with_no_accounts.json
@@ -0,0 +1,5 @@
+{
+  "accounts_endpoint": "no_accounts.py",
+  "client_metadata_endpoint": "client_metadata.py",
+  "id_assertion_endpoint": "token_with_account_id.py"
+}
diff --git a/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py b/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py
new file mode 100644
index 00000000000..e3948084df1
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/fedcm/no_accounts.py
@@ -0,0 +1,25 @@
+def main(request, response):
+  if request.cookies.get(b"cookie") != b"1":
+    return (530, [], "Missing cookie")
+  if request.headers.get(b"Accept") != b"application/json":
+    return (531, [], "Wrong Accept")
+  if request.headers.get(b"Sec-Fetch-Dest") != b"webidentity":
+    return (532, [], "Wrong Sec-Fetch-Dest header")
+  if request.headers.get(b"Referer"):
+    return (533, [], "Should not have Referer")
+  if request.headers.get(b"Origin"):
+    return (534, [], "Should not have Origin")
+  if request.headers.get(b"Sec-Fetch-Mode") != b"no-cors":
+    return (535, [], "Wrong Sec-Fetch-Mode header")
+  if request.headers.get(b"Sec-Fetch-Site") != b"none":
+    return (536, [], "Wrong Sec-Fetch-Site header")
+
+  response.headers.set(b"Content-Type", b"application/json")
+
+  return """
+{
+ "accounts": [
+  ]
+}
+"""
+
diff --git a/tests/wpt/tests/credential-management/support/mark_signedin b/tests/wpt/tests/credential-management/support/mark_signedin
new file mode 100644
index 00000000000..d9adcaa7629
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/mark_signedin
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script>
+// The important part of this page are the headers.
+
+// If this page was opened as a popup, notify the opener.
+if (window.opener) {
+  window.opener.postMessage("done_loading", "*");
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/credential-management/support/mark_signedin.headers b/tests/wpt/tests/credential-management/support/mark_signedin.headers
new file mode 100644
index 00000000000..21ee3bbb24c
--- /dev/null
+++ b/tests/wpt/tests/credential-management/support/mark_signedin.headers
@@ -0,0 +1,2 @@
+Content-Type: text/html
+Idp-Signin-Status: action=signin
diff --git a/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html
new file mode 100644
index 00000000000..2148d89317f
--- /dev/null
+++ b/tests/wpt/tests/css/css-contain/content-visibility/content-visibility-085.html
@@ -0,0 +1,35 @@
+<!doctype HTML>
+<meta charset="utf8">
+<title>CSS Content Visibility: auto with content changes</title>
+<link rel="author" title="Cathie Chen" href="mailto:cathiechen@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="content-visibility auto element should be resized when content changes">
+
+<style>
+.auto {
+  content-visibility: auto;
+  width: fit-content;
+}
+.hidden { height: 0; }
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div class="auto">
+  <div id ="target" class="hidden">
+    <div style="width: 100px; height: 100px; background-color: green;"></div>
+  </div>
+</div>
+
+<script>
+function changeContent() {
+  requestAnimationFrame(() => {
+    target.classList.toggle("hidden");
+  });
+}
+function runTest() {
+  requestAnimationFrame(changeContent);
+}
+
+window.onload = () => { requestAnimationFrame(runTest); };
+</script>
diff --git a/tests/wpt/tests/css/css-fonts/font-size-adjust-reload-ref.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-reload-ref.html
new file mode 100644
index 00000000000..efa8c1d76e1
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-size-adjust-reload-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Vitor Roriz" href="https://github.com/vitorroriz">
+<link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop">
+<style>
+html {
+    margin: 0;
+    padding: 0;
+}
+body {
+    font-family: system-ui;
+    font-size: 100px;
+    font-size-adjust: 0.528;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    height: 200px;
+    width: 200px;
+}
+</style>
+</head>
+<body>
+    <div id="target">A</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-fonts/font-size-adjust-reload.html b/tests/wpt/tests/css/css-fonts/font-size-adjust-reload.html
new file mode 100644
index 00000000000..37d79a68bd8
--- /dev/null
+++ b/tests/wpt/tests/css/css-fonts/font-size-adjust-reload.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<link rel="author" title="Vitor Roriz" href="https://github.com/vitorroriz">
+<link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop">
+<link rel="match" href="font-size-adjust-reload-ref.html">
+<style>
+body {
+    margin: 0;
+    padding: 0;
+}
+</style>
+</head>
+<body>
+    <iframe id="iframe" width=400 height=400 frameBorder=0 src="font-size-adjust-reload-ref.html"></iframe>
+</body>
+<script>
+    const iframe = document.getElementById('iframe');
+    // Forcing reload
+    iframe.src += '';
+    iframe.contentWindow.onload = function(){
+        document.documentElement.classList.remove("reftest-wait");
+    };
+</script>
+</html>
diff --git a/tests/wpt/tests/css/css-images/image-set/image-set-all-options-invalid.html b/tests/wpt/tests/css/css-images/image-set/image-set-all-options-invalid.html
new file mode 100644
index 00000000000..14d3d0b6e55
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/image-set/image-set-all-options-invalid.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>image-set() is an invalid image if all options are invalid</title>
+<link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
+<link rel="help" href="https://drafts.csswg.org/css-images-4/#invalid-image">
+<link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#border-image-source">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<style>
+  #target {
+      width: 100px;
+      height: 100px;
+      box-sizing: border-box;
+      background-color: red;
+      border: 50px solid green;
+      border-image: 1 / 10px image-set(url('data:image/png;base64,') type('image/unknown'));
+  }
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div id="target"></div>
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2-ref.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2-ref.html
deleted file mode 100644
index bbb5ef2c414..00000000000
--- a/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2-ref.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Masking: mask-origin: mask positioning area</title>
-    <link rel="author" title="Astley Chen" href="mailto:aschen@mozilla.com">
-    <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-    <style type="text/css">
-      div.outer {
-        border: 1px solid black;
-        width: 125px;
-        height: 125px;
-        position: relative;
-      }
-
-      div.inner {
-        width: 50px;
-        height: 50px;
-        background-color: purple;
-        position: absolute;
-      }
-
-      #pos-left-auto { left: 0px; top: 22px; }
-      #pos-left-bottom { left: 0px; top: 44px; }
-      #pos-right-top { left: 36px; top: 0px; }
-      #pos-right-bottom { left: 36px; top: 44px; }
-    </style>
-  </head>
-  <body>
-    <div class="outer"><div class="inner" id="pos-left-auto"></div></div>
-    <div class="outer"><div class="inner" id="pos-left-bottom"></div></div>
-    <div class="outer"><div class="inner" id="pos-right-top"></div></div>
-    <div class="outer"><div class="inner" id="pos-right-bottom"></div></div>
-  </body>
-</html>
diff --git a/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2.html b/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2.html
deleted file mode 100644
index 90ee89b15df..00000000000
--- a/tests/wpt/tests/css/css-masking/mask-image/mask-origin-2.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Masking: mask-origin: mask positioning area</title>
-    <link rel="author" title="Astley Chen" href="mailto:aschen@mozilla.com">
-    <link rel="author" title="Mozilla" href="https://www.mozilla.org">
-    <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-mask-origin">
-    <link rel="match" href="mask-origin-2-ref.html">
-    <meta name="assert" content="Test checks whether setting mask origin to margin-box works correctly or not.">
-    <style type="text/css">
-      div.outer {
-        border: 1px solid black;
-        width: 125px;
-        height: 125px;
-      }
-
-      div.inner {
-        /*
-         * content box: 60 x 60
-         * padding box: 72 x 78
-         * border  box: 80 x 90
-         * margin  box: 86 x 94
-         */
-        margin: 1px 2px 3px 4px;
-        border: solid red;
-        border-width: 8px 2px 4px 6px;
-        padding: 6px 9px 12px 3px;
-        width: 60px;
-        height: 60px;
-        position: relative;
-        background-color: blue;
-        mask-image: url(support/50x50-opaque-blue.svg);
-        mask-repeat: no-repeat;
-        mask-origin: margin-box;
-      }
-
-      div.overflow {
-        position: absolute;
-        left: -10px;
-        top: -9px;
-        border: solid transparent;
-        border-width: 15px 13px 19px 13px;
-        width: 60px;
-        height: 60px;
-        background-color: purple;
-      }
-
-      #pos-left-auto { mask-position: left; }
-      #pos-left-bottom { mask-position: left bottom; }
-      #pos-right-top { mask-position: right top; }
-      #pos-right-bottom { mask-position: right bottom; }
-    </style>
-  </head>
-  <body>
-    <div class="outer">
-      <div class="inner" id="pos-left-auto">
-        <div class="overflow"></div>
-      </div>
-    </div>
-    <div class="outer">
-      <div class="inner" id="pos-left-bottom">
-        <div class="overflow"></div>
-      </div>
-    </div>
-    <div class="outer">
-      <div class="inner" id="pos-right-top">
-        <div class="overflow"></div>
-      </div>
-    </div>
-    <div class="outer">
-      <div class="inner" id="pos-right-bottom">
-        <div class="overflow"></div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/tests/css/css-masking/parsing/mask-invalid.html b/tests/wpt/tests/css/css-masking/parsing/mask-invalid.html
index 367049cf19f..f9999ca9828 100644
--- a/tests/wpt/tests/css/css-masking/parsing/mask-invalid.html
+++ b/tests/wpt/tests/css/css-masking/parsing/mask-invalid.html
@@ -29,6 +29,8 @@ test_invalid_value('mask', 'no-clip border-box content-box');
 
 test_invalid_value('mask', 'content-box stroke-box no-clip');
 
+test_invalid_value('mask', 'margin-box');
+
 test_invalid_value('mask', 'add intersect');
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html b/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html
index e0646444d48..6b6d712d175 100644
--- a/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html
+++ b/tests/wpt/tests/css/css-masking/parsing/mask-valid.sub.html
@@ -29,12 +29,11 @@ test_valid_value('mask', 'url("https://{{host}}/") 1px 2px / contain');
 test_valid_value('mask', 'repeat-y');
 
 // <geometry-box> = <shape-box> | fill-box | stroke-box | view-box
-// <shape-box> = <box> | margin-box
+// <shape-box> = <box>
 // <box> = border-box | padding-box | content-box
 test_valid_value('mask', 'border-box', 'none');
 test_valid_value('mask', 'linear-gradient(to left bottom, red, blue) padding-box');
 test_valid_value('mask', 'content-box');
-test_valid_value('mask', 'margin-box');
 test_valid_value('mask', 'url("https://{{host}}/") fill-box');
 test_valid_value('mask', 'linear-gradient(to left bottom, red, blue) stroke-box');
 test_valid_value('mask', 'view-box');
diff --git a/tests/wpt/tests/css/css-multicol/crashtests/floated-input-in-inline-next-column.html b/tests/wpt/tests/css/css-multicol/crashtests/floated-input-in-inline-next-column.html
new file mode 100644
index 00000000000..1b84cd3d99a
--- /dev/null
+++ b/tests/wpt/tests/css/css-multicol/crashtests/floated-input-in-inline-next-column.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+  <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1451185">
+  <div id="container" style="opacity:0.0;">
+    <div style="columns:3; orphans:1; widows:1;">
+      <br>
+      <span><input style="float:right;"></span>
+    </div>
+  </div>
+  <script>
+    requestAnimationFrame(()=> {
+      requestAnimationFrame(()=> {
+        container.style.opacity = "1";
+        document.documentElement.classList.remove("reftest-wait");
+      });
+    });
+  </script>
+</html>
diff --git a/tests/wpt/tests/css/css-position/sticky/position-sticky-details-crash.html b/tests/wpt/tests/css/css-position/sticky/position-sticky-details-crash.html
new file mode 100644
index 00000000000..65b7ea48807
--- /dev/null
+++ b/tests/wpt/tests/css/css-position/sticky/position-sticky-details-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1470149">
+<details>
+  <div id="target" style="position: sticky; top: 0px;"></div>
+</details>
+<script>
+document.execCommand('selectAll');
+document.getElementById('target').remove();
+document.body.style.height = '100%';
+</script>
diff --git a/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html b/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html
new file mode 100644
index 00000000000..b34caf87f12
--- /dev/null
+++ b/tests/wpt/tests/css/css-scroll-snap/overscroll-snap.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1/#scroll-snap-type" />
+    <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>
+  </head>
+  <body>
+    <style>
+      #scroller {
+        width: 200px;
+        height: 400px;
+        overflow-y: scroll;
+        scroll-snap-type: y mandatory;
+        background-color: blue;
+      }
+      #snap_target {
+        width: 100px;
+        height: 1942.5px;
+        scroll-snap-align: start;
+        background-color: pink;
+      }
+    </style>
+    <div id="scroller">
+      <div id="snap_target"></div>
+    </div>
+    <script>
+      promise_test(async (t) => {
+        await waitForCompositorCommit();
+        let scrollend_promise = waitForScrollendEvent(t, scroller);
+        let scroll_promise = new Promise((resolve) => {
+          scroller.addEventListener("scroll", resolve);
+        });
+        await new test_driver.Actions().scroll(0, 0, 0,
+            scroller.scrollHeight, { origin: scroller }).send();
+        await scroll_promise;
+        await scrollend_promise;
+        assert_approx_equals(scroller.scrollTop,
+            scroller.scrollHeight - scroller.clientHeight, 1,
+            "scroller is scrolled to its bottom and not its top.");
+      }, "snapport covered by snap area doesn't jump");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html
new file mode 100644
index 00000000000..dbc18b8e291
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+.container > div {
+  width: 3em;
+  font-size: 10px;
+  border: 1px solid;
+}
+</style>
+<div class="container" lang="ja">
+  <div>ドライ<br>ブ</div>
+  <div>ドラ<br>イブ</div>
+  <div>ドラ<br>イブ</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html
new file mode 100644
index 00000000000..76944730d5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-001.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="word-break-auto-phrase-wbr-nobr-001-ref.html">
+<!--
+  This test assumes that all engines segment a Japanese text:
+    ドライブ
+  as a single phrase.
+
+  While assuming all engines segment this way looks fairly reasonable,
+  segmenting differently doesn't necessarily mean a failure because the
+  algorithm is UA dependent. Please add references if different.
+-->
+<style>
+.container > div {
+  word-break: auto-phrase;
+  width: 3em;
+  font-size: 10px;
+  border: 1px solid;
+}
+</style>
+<div class="container" lang="ja">
+  <!-- A phrase that doesn't fit should fall back to `normal`. -->
+  <div>ドライブ</div>
+  <!-- `<wbr>` in a phrase should allow breaking there. -->
+  <div>ドラ<wbr>イブ</div>
+  <!-- `&ZeroWidthSpace;` in a phrase should allow breaking there too. -->
+  <div>ドラ&ZeroWidthSpace;イブ</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html
new file mode 100644
index 00000000000..72d89af9bf7
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+.container > div {
+  width: 10em;
+  font-size: 10px;
+  border: 1px solid;
+}
+</style>
+<div class="container" lang="ja">
+  <div>楽しいドライブ、<br>楽しいドライブ。</div>
+  <div>楽しい<br>ドライブ、楽しい<br>ドライブ。</div>
+</div>
diff --git a/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html
new file mode 100644
index 00000000000..9b4e55623c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-text/word-break/auto-phrase/word-break-auto-phrase-wbr-nobr-002.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-4/#word-break-property">
+<link rel="match" href="word-break-auto-phrase-wbr-nobr-002-ref.html">
+<!--
+  This test assumes that all engines segment a Japanese text:
+    楽しいドライブ
+  to the following phrases:
+    楽しい / ドライブ
+
+  While assuming all engines segment this way looks fairly reasonable,
+  segmenting differently doesn't necessarily mean a failure because the
+  algorithm is UA dependent. Please add references if different.
+-->
+<style>
+.container > div {
+  word-break: auto-phrase;
+  width: 10em;
+  font-size: 10px;
+  border: 1px solid;
+}
+nobr {
+  white-space: nowrap;
+}
+</style>
+<div class="container" lang="ja">
+  <!-- `<nobr>` can turn 4 phrases to 3 phrases. -->
+  <div>楽しいドライブ、楽しいドライブ。</div>
+  <div>楽しい<nobr>ドライブ、楽しい</nobr>ドライブ。</div>
+</div>
diff --git a/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element-ref.html b/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element-ref.html
index 8b3c3b08af4..c8e68f55995 100644
--- a/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element-ref.html
+++ b/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element-ref.html
@@ -9,4 +9,3 @@ div {
 }
 </style>
 <div></div>
-</div>
diff --git a/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element.html b/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element.html
index f3a4441e991..a84482e5ecd 100644
--- a/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element.html
+++ b/tests/wpt/tests/css/css-transforms/preserve3d-pseudo-element.html
@@ -21,4 +21,3 @@ div::before {
 }
 </style>
 <div></div>
-</div>
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box-001.html
similarity index 100%
rename from tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box.html
rename to tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box-001.html
diff --git a/tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box-002.html b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box-002.html
new file mode 100644
index 00000000000..24e038b562d
--- /dev/null
+++ b/tests/wpt/tests/css/css-transforms/transform-box/cssbox-content-box-002.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>transform-box: content-box (CSS layout), percentage padding</title>
+<link rel="match" href="reference/cssbox-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-transforms-1/#transform-box">
+<meta name="assert" content="This should display a square with a black bar at the top whose top-left corner is at 100,100."/>
+<style>
+#target {
+    width: 125px;
+    height: 200px;
+    margin-left: 300px;
+    margin-top: 100px;
+    padding-left: 25%;
+    background-color: green;
+    border-left: solid 50px black;
+
+    transform: rotate(90deg);
+    transform-origin: -75px 0;
+    transform-box: content-box;
+}
+</style>
+<div style="width: 100px">
+  <div id="target"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-variables/wide-keyword-fallback-ref.html b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-001-ref.html
similarity index 100%
rename from tests/wpt/tests/css/css-variables/wide-keyword-fallback-ref.html
rename to tests/wpt/tests/css/css-variables/wide-keyword-fallback-001-ref.html
diff --git a/tests/wpt/tests/css/css-variables/wide-keyword-fallback.html b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-001.html
similarity index 91%
rename from tests/wpt/tests/css/css-variables/wide-keyword-fallback.html
rename to tests/wpt/tests/css/css-variables/wide-keyword-fallback-001.html
index bb27a61e610..947c253837c 100644
--- a/tests/wpt/tests/css/css-variables/wide-keyword-fallback.html
+++ b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Mozilla" href="https://mozilla.org">
 <link rel="help" href="https://drafts.csswg.org/css-variables/#substitute-a-var">
 <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1544886">
-<link rel="match" href="wide-keyword-fallback-ref.html">
+<link rel="match" href="wide-keyword-fallback-001-ref.html">
 <style>
   /* Should see a 10px border of the initial color */
   #outer {
diff --git a/tests/wpt/tests/css/css-variables/wide-keyword-fallback-002-ref.html b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-002-ref.html
new file mode 100644
index 00000000000..404a3da9d5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-002-ref.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<div style="color: green">
+  Should be green
+</div>
diff --git a/tests/wpt/tests/css/css-variables/wide-keyword-fallback-002.html b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-002.html
new file mode 100644
index 00000000000..315468a75ec
--- /dev/null
+++ b/tests/wpt/tests/css/css-variables/wide-keyword-fallback-002.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<title>CSS Test: Wide keyword can be used as a fallback variable value for custom properties themselves</title>
+<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-variables/#substitute-a-var">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1544886">
+<link rel="match" href="wide-keyword-fallback-002-ref.html">
+<style>
+  .outer1 {
+    --color: green;
+  }
+  .outer2 {
+    --color: var(--foo, unset);
+  }
+  .inner {
+    color: var(--color);
+  }
+</style>
+<div class="outer1">
+  <div class="outer2">
+    <div class="inner">
+      Should be green
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-will-change/will-change-contents-crash.html b/tests/wpt/tests/css/css-will-change/will-change-contents-crash.html
new file mode 100644
index 00000000000..b2a05dac869
--- /dev/null
+++ b/tests/wpt/tests/css/css-will-change/will-change-contents-crash.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<head>
+  <title>CSS will-change contents: Chrome crash with partial cache hit</title>
+  <link rel="author" href="mailto:sesse@chromium.org">
+  <link rel="help" href="https://crbug.com/1469858">
+</head>
+<body>
+  <div style="color: blue;"><div style="will-change: contents;">Test passes</div></div>
+  <div style="color: fuchsia;"><div style="will-change: contents;">if it does not crash.</div></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html
index 38ef5eb9bbf..1831af7019d 100644
--- a/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html
+++ b/tests/wpt/tests/css/motion/offset-path-shape-ellipse-003.html
@@ -1,7 +1,9 @@
 <!doctype html>
 <meta charset="utf-8">
 <title>CSS Motion Path test: &lt;basic-shape&gt; ellipse() path with offset-distance</title>
-<meta name=fuzzy content="0-25;0-450">
+<!-- Chrome currently passes with 13 max pixel difference and 473 total different pixels -->
+<!-- You can increase the numbers to handle anti-aliasing -->
+<meta name=fuzzy content="0-25;0-473">
 <link rel="author" title="Daniil Sakhapov" href="sakhapov@google.com">
 <link rel="match" href="offset-path-shape-ellipse-003-ref.html">
 <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-basic-shape">
diff --git a/tests/wpt/tests/css/motion/offset-path-url-001-ref.html b/tests/wpt/tests/css/motion/offset-path-url-001-ref.html
new file mode 100644
index 00000000000..f8fde8afae0
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-001-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path Referecne: url() to svg paths</title>
+    <style>
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        transform: translate(100px, 60px) rotate(90deg);
+        transform-origin: 0% 0%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="target"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-001.html b/tests/wpt/tests/css/motion/offset-path-url-001.html
new file mode 100644
index 00000000000..0c7ac4f1019
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-001.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to svg paths</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="match" href="offset-path-url-001-ref.html">
+    <meta name="assert" content="This tests that url() referenced to a svg path
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgPath);
+        offset-anchor: 0% 0%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <path id="svgPath" d='m 100 60 v 200'/>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-002-ref.html b/tests/wpt/tests/css/motion/offset-path-url-002-ref.html
new file mode 100644
index 00000000000..177d71385fc
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-002-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path Referecne: url() to rect</title>
+    <style>
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        transform: translate(275px, 75px) rotate(90deg);
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="target"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-002.html b/tests/wpt/tests/css/motion/offset-path-url-002.html
new file mode 100644
index 00000000000..7957d785a3f
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-002.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to rectangles</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#RectElement">
+    <link rel="match" href="offset-path-url-002-ref.html">
+    <meta name="assert" content="This tests that url() referenced to a rect
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgRect);
+        offset-distance: 37.5%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <rect id="svgRect" width="200" height="200" x="100"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-003-ref.html b/tests/wpt/tests/css/motion/offset-path-url-003-ref.html
new file mode 100644
index 00000000000..e34976213e3
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-003-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path Referecne: url() to circle</title>
+    <style>
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        transform: translate(125px, 125px) rotate(180deg);
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="target"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-003.html b/tests/wpt/tests/css/motion/offset-path-url-003.html
new file mode 100644
index 00000000000..4485b52d071
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-003.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to circles</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#CircleElement">
+    <link rel="match" href="offset-path-url-003-ref.html">
+    <meta name=fuzzy content="0-35;0-76">
+    <meta name="assert" content="This tests that url() referenced to a circle
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgCircle);
+        offset-distance: 25%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <circle id="svgCircle" cx="150" cy="100" r="50"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-004-ref.html b/tests/wpt/tests/css/motion/offset-path-url-004-ref.html
new file mode 100644
index 00000000000..4ff49d968e0
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-004-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path Referecne: url() to ellipse</title>
+    <style>
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        transform: translate(175px, 125px) rotate(180deg);
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="target"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-004.html b/tests/wpt/tests/css/motion/offset-path-url-004.html
new file mode 100644
index 00000000000..05aea375a18
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-004.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to ellipses</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#EllipseElement">
+    <link rel="match" href="offset-path-url-004-ref.html">
+    <meta name=fuzzy content="0-15;0-65">
+    <meta name="assert" content="This tests that url() referenced to an ellipse
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgEllipse);
+        offset-distance: 25%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <ellipse id="svgEllipse" cx="200" cy="100" rx="100" ry="50"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-005.html b/tests/wpt/tests/css/motion/offset-path-url-005.html
new file mode 100644
index 00000000000..437a111a7ea
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-005.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to lines</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#LineElement">
+    <link rel="match" href="offset-path-url-001-ref.html">
+    <meta name="assert" content="This tests that url() referenced to a line
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgLine);
+        offset-distance: 50%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <line id="svgLine" x1="75" y1="0" x2="75" y2="170"/>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-006.html b/tests/wpt/tests/css/motion/offset-path-url-006.html
new file mode 100644
index 00000000000..b65af774bb7
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-006.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to polylines</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#PolylineElement">
+    <link rel="match" href="offset-path-url-001-ref.html">
+    <meta name="assert" content="This tests that url() referenced to a polyline
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgPolyline);
+        offset-distance: 50%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <polyline id="svgPolyline" points="75,0 75,170"/>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-007.html b/tests/wpt/tests/css/motion/offset-path-url-007.html
new file mode 100644
index 00000000000..0f80207c0e3
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-007.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() to polygons</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="help" href="https://svgwg.org/svg2-draft/shapes.html#PolygonElement">
+    <link rel="match" href="offset-path-url-002-ref.html">
+    <meta name="assert" content="This tests that url() referenced to a polygon
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 400px;
+        height: 200px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgPolygon);
+        offset-distance: 37.5%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <polygon id="svgPolygon" points="100,0 300,0 300,200 100,200"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-008-ref.html b/tests/wpt/tests/css/motion/offset-path-url-008-ref.html
new file mode 100644
index 00000000000..3e99530eb30
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-008-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path Referecne: url() with border-box</title>
+    <style>
+      #outer {
+        width: 300px;
+        height: 100px;
+        padding: 50px;
+        border: 50px solid black;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        transform: translate(25px, -25px);
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-008.html b/tests/wpt/tests/css/motion/offset-path-url-008.html
new file mode 100644
index 00000000000..48b99006f94
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-008.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() with border-box</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="match" href="offset-path-url-008-ref.html">
+    <meta name="assert" content="This tests that url() using border-box
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 300px;
+        height: 100px;
+        padding: 50px;
+        border: 50px solid black;
+      }
+      #target {
+        position: relative;
+        /**
+         * offset-path:url() references to the svg element and treats coord-box
+         * as its user coordinate system. And the svg element always gives it
+         * the offset starting position (based on the svg attributes). So the
+         * transformed box should ignore its current position from CSS layout.
+         * Intentionally use left property to make sure we ignore it.
+         */
+        left: 100px;
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgRect) border-box;
+        offset-distance: 0%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <rect id="svgRect" width="100" height="100" x="150" y="100"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-009.html b/tests/wpt/tests/css/motion/offset-path-url-009.html
new file mode 100644
index 00000000000..90a13d18f4b
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-009.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() with padding-box</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="match" href="offset-path-url-008-ref.html">
+    <meta name="assert" content="This tests that url() using padding-box
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 300px;
+        height: 100px;
+        padding: 50px;
+        border: 50px solid black;
+      }
+      #target {
+        position: relative;
+        /**
+         * offset-path:url() references to the svg element and treats coord-box
+         * as its user coordinate system. And the svg element always gives it
+         * the offset starting position (based on the svg attributes). So the
+         * transformed box should ignore its current position from CSS layout.
+         * Intentionally use left property to make sure we ignore it.
+         */
+        left: 100px;
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgRect) padding-box;
+        offset-distance: 0%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <rect id="svgRect" width="100" height="100" x="100" y="50"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-010.html b/tests/wpt/tests/css/motion/offset-path-url-010.html
new file mode 100644
index 00000000000..d2907704597
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-010.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() with content-box</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="match" href="offset-path-url-008-ref.html">
+    <meta name="assert" content="This tests that url() using content-box
+      generates a rotation and translation.">
+    <style>
+      #outer {
+        width: 300px;
+        height: 100px;
+        padding: 50px;
+        border: 50px solid black;
+      }
+      #target {
+        position: relative;
+        /**
+         * offset-path:url() references to the svg element and treats coord-box
+         * as its user coordinate system. And the svg element always gives it
+         * the offset starting position (based on the svg attributes). So the
+         * transformed box should ignore its current position from CSS layout.
+         * Intentionally use left property to make sure we ignore it.
+         */
+        left: 100px;
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        offset-path: url(#svgRect) content-box;
+        offset-distance: 0%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+    <svg width="400" height="200" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <rect id="svgRect" width="100" height="100" x="50" y="0"/>
+      </defs>
+    </svg>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-011-ref.html b/tests/wpt/tests/css/motion/offset-path-url-011-ref.html
new file mode 100644
index 00000000000..d0f97eda1dd
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-011-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path Referecne: url() to non SVG elements</title>
+    <style>
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        transform: translate(25px, 25px);
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="target"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-011.html b/tests/wpt/tests/css/motion/offset-path-url-011.html
new file mode 100644
index 00000000000..84dfe5205ba
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-011.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: offset-path:url() reference to non-SVG elements</title>
+    <link rel="help" href="https://drafts.fxtf.org/motion/#valdef-offset-path-url">
+    <link rel="match" href="offset-path-url-011-ref.html">
+    <meta name="assert" content='This tests that url() references to a non-SVG
+      element and behaves as path("m 0 0") instead.'>
+    <style>
+      #outer {
+        position: relative;
+        left: 50px;
+        top: 50px;
+        width: 300px;
+        height: 100px;
+      }
+      #target {
+        width: 50px;
+        height: 50px;
+        background-color: green;
+        /* This behaves as 'offset-path: path("m 0 0")' */
+        offset-path: url(#outer);
+        offset-anchor: 50% 50%;
+        offset-distance: 0%;
+        border-radius: 50% 50% 0 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="outer">
+      <div id="target"></div>
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-crash.html b/tests/wpt/tests/css/motion/offset-path-url-crash.html
new file mode 100644
index 00000000000..c6fe6319113
--- /dev/null
+++ b/tests/wpt/tests/css/motion/offset-path-url-crash.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Motion Path: path(url) paths</title>
+    <link rel="help" href="https://crbug.com/1465301">
+    <meta name="assert" content="This tests that path(<url>) does not crash when the url() is removed before target.">
+    <style>
+      #test {
+        position: absolute;
+        left: 300px;
+        top: 0px;
+        width: 300px;
+        height: 200px;
+        background-color: lime;
+        transform-origin: 0px 0px;
+        offset-path: url(#target);
+      }
+    </style>
+  </head>
+  <body onload="start();">
+    <iframe id="target"></iframe>
+    <div id="test"></div>
+  </body>
+  <script>
+    async function change_style_and_remove() {
+      let el = document.querySelectorAll("style")[0];
+      el.innerHTML = "garbadge";
+      let t = document.createElement("frame");
+      document.body.appendChild(t);
+      let target = document.querySelectorAll("iframe")[0];
+      target.parentNode.removeChild(target);
+    }
+    function start() {
+      change_style_and_remove();
+    }
+  </script>
+</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url-ref.html b/tests/wpt/tests/css/motion/offset-path-url-ref.html
deleted file mode 100644
index c5f8ec74e87..00000000000
--- a/tests/wpt/tests/css/motion/offset-path-url-ref.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>CSS Motion Path: path(url) paths</title>
-    <style>
-      #target {
-        position: absolute;
-        left: 300px;
-        top: 0px;
-        width: 300px;
-        height: 200px;
-        background-color: lime;
-        transform-origin: 0px 0px;
-        transform: rotate(90deg) translate(120px);
-      }
-    </style>
-  </head>
-  <body>
-    <div id="target"></div>
-  </body>
-</html>
diff --git a/tests/wpt/tests/css/motion/offset-path-url.html b/tests/wpt/tests/css/motion/offset-path-url.html
deleted file mode 100644
index b8cd89104fb..00000000000
--- a/tests/wpt/tests/css/motion/offset-path-url.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>CSS Motion Path: path(url) paths</title>
-    <link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
-    <link rel="match" href="offset-path-url-ref.html">
-    <meta name="assert" content="This tests that path(<url>) generates a rotation and translation.">
-    <style>
-      #target {
-        position: absolute;
-        left: 300px;
-        top: 0px;
-        width: 300px;
-        height: 200px;
-        background-color: lime;
-        transform-origin: 0px 0px;
-        offset-path: url(#svgPath);
-      }
-    </style>
-  </head>
-  <body>
-    <div id="target"></div>
-    <svg height="220" width="300" xmlns="http://www.w3.org/2000/svg">
-        <path id="svgPath" d='m 0 120 v 200'/>
-    </svg>
-  </body>
-</html>
diff --git a/tests/wpt/tests/css/selectors/has-sibling-chrome-crash.html b/tests/wpt/tests/css/selectors/has-sibling-chrome-crash.html
new file mode 100644
index 00000000000..0306e3e3927
--- /dev/null
+++ b/tests/wpt/tests/css/selectors/has-sibling-chrome-crash.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS Selectors Test: Chrome crash issue 1470477</title>
+<link rel="help" href="https://crbug.com/1470477">
+<style>
+  :has(> :where(label:first-child + [a="a"]:only-of-type,
+    [a="a"]:only-of-type + label:last-child)) label:last-child {
+      margin-inline: 1em;
+  }
+</style>
+<p>PASS if this tests does not crash</p>
diff --git a/tests/wpt/tests/css/selectors/user-invalid.html b/tests/wpt/tests/css/selectors/user-invalid.html
index 222f36e33b3..e7e008e677b 100644
--- a/tests/wpt/tests/css/selectors/user-invalid.html
+++ b/tests/wpt/tests/css/selectors/user-invalid.html
@@ -8,21 +8,29 @@
 <script src="/resources/testdriver-vendor.js"></script>
 
 <style>
-input {
+:is(input:not([type=submit], [type=reset]), textarea) {
   border: 2px solid black;
 }
 
-input:user-valid {
+:is(input:not([type=submit], [type=reset]), textarea):user-valid {
   border-color: green;
 }
 
-input:user-invalid {
+:is(input:not([type=submit], [type=reset]), textarea):user-invalid {
   border-color: red;
 }
 </style>
 
 <input id="initially-invalid" type="email" value="foo">
 
+<p>Test form interactions (reset / submit):</p>
+<form id="form">
+  <input placeholder="Required field" required id="required-input"><br>
+  <textarea placeholder="Required field" required id="required-textarea"></textarea><br>
+  <input type="submit" id="submit-button">
+  <input type="reset" id="reset-button">
+</form>
+
 <script>
 promise_test(async () => {
   const input = document.querySelector("#initially-invalid");
@@ -55,6 +63,39 @@ promise_test(async () => {
   assert_false(input.matches(":user-invalid"), "Put an valid email, :user-invalid no longer matches");
 }, ':user-invalid selector should respond to user action');
 
+promise_test(async () => {
+  const form = document.querySelector("#form");
+  const requiredInput = document.querySelector("#required-input");
+  const requiredTextarea = document.querySelector("#required-textarea");
+  const submitButton = document.querySelector("#submit-button");
+  const resetButton = document.querySelector("#reset-button");
+
+  assert_false(requiredInput.validity.valid);
+  assert_false(requiredTextarea.validity.valid);
+  // The selector can't match because no interaction has happened.
+  assert_false(requiredInput.matches(":user-valid"), "Initially does not match :user-valid");
+  assert_false(requiredInput.matches(":user-invalid"), "Initially does not match :user-invalid");
+
+  assert_false(requiredTextarea.matches(":user-valid"), "Initially does not match :user-valid");
+  assert_false(requiredTextarea.matches(":user-invalid"), "Initially does not match :user-invalid");
+
+  await test_driver.click(submitButton);
+
+  assert_true(requiredInput.matches(":user-invalid"), "Submitted the form, input is validated");
+  assert_false(requiredInput.matches(":user-valid"), "Submitted the form, input is validated");
+
+  assert_true(requiredTextarea.matches(":user-invalid"), "Submitted the form, textarea is validated");
+  assert_false(requiredTextarea.matches(":user-valid"), "Submitted the form, textarea is validated");
+
+  await test_driver.click(resetButton);
+
+  assert_false(requiredInput.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
+  assert_false(requiredInput.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
+
+  assert_false(requiredTextarea.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
+  assert_false(requiredTextarea.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
+}, ":user-invalid selector properly interacts with submit & reset buttons");
+
 // historical: https://github.com/w3c/csswg-drafts/issues/1329
 test(() => {
   const input = document.querySelector('input');
diff --git a/tests/wpt/tests/css/selectors/user-valid.html b/tests/wpt/tests/css/selectors/user-valid.html
index 12b89282c3e..86e756df2ee 100644
--- a/tests/wpt/tests/css/selectors/user-valid.html
+++ b/tests/wpt/tests/css/selectors/user-valid.html
@@ -8,28 +8,35 @@
 <script src="/resources/testdriver-vendor.js"></script>
 
 <style>
-input {
+:is(input:not([type=submit], [type=reset]), textarea) {
   border: 2px solid black;
 }
 
-input:user-valid {
+:is(input:not([type=submit], [type=reset]), textarea):user-valid {
   border-color: green;
 }
 
-input:user-invalid {
+:is(input:not([type=submit], [type=reset]), textarea):user-invalid {
   border-color: red;
 }
 </style>
 
 <input id="initially-valid" type="email">
 
+<p>Test form interactions (reset / submit):</p>
+<form id="form">
+  <input placeholder="Optional field" id="optional-input"><br>
+  <textarea placeholder="Optional field" id="optional-textarea"></textarea><br>
+  <input required placeholder="Required field"> <!-- Prevent the form from navigating with this invalid input -->
+  <input type="submit" id="submit-button">
+  <input type="reset" id="reset-button">
+</form>
+
 <script>
 promise_test(async () => {
   const input = document.querySelector("#initially-valid");
   assert_true(input.validity.valid);
   // The selector can't match because no interaction has happened.
-  assert_false(input.matches(':user-valid'));
-
   assert_false(input.matches(":user-valid"), "Initially does not match :user-valid");
   assert_false(input.matches(":user-invalid"), "Initially does not match :user-invalid");
 
@@ -52,4 +59,37 @@ promise_test(async () => {
   assert_false(input.matches(":user-valid"), "Cleared required input, :user-valid no longer matches");
   assert_true(input.matches(":user-invalid"), "Cleared required input, :user-invalid now matches");
 }, ":user-valid selector should respond to user action");
+
+promise_test(async () => {
+  const form = document.querySelector("#form");
+  const optionalInput = document.querySelector("#optional-input");
+  const optionalTextarea = document.querySelector("#optional-textarea");
+  const submitButton = document.querySelector("#submit-button");
+  const resetButton = document.querySelector("#reset-button");
+
+  assert_true(optionalInput.validity.valid);
+  assert_true(optionalTextarea.validity.valid);
+  // The selector can't match because no interaction has happened.
+  assert_false(optionalInput.matches(":user-valid"), "Initially does not match :user-valid");
+  assert_false(optionalInput.matches(":user-invalid"), "Initially does not match :user-invalid");
+
+  assert_false(optionalTextarea.matches(":user-valid"), "Initially does not match :user-valid");
+  assert_false(optionalTextarea.matches(":user-invalid"), "Initially does not match :user-invalid");
+
+  await test_driver.click(submitButton);
+
+  assert_true(optionalInput.matches(":user-valid"), "Submitted the form, input is validated");
+  assert_false(optionalInput.matches(":user-invalid"), "Submitted the form, input is validated");
+
+  assert_true(optionalTextarea.matches(":user-valid"), "Submitted the form, textarea is validated");
+  assert_false(optionalTextarea.matches(":user-invalid"), "Submitted the form, textarea is validated");
+
+  await test_driver.click(resetButton);
+
+  assert_false(optionalInput.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
+  assert_false(optionalInput.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
+
+  assert_false(optionalTextarea.matches(":user-valid"), "Reset the form, user-interacted flag is reset");
+  assert_false(optionalTextarea.matches(":user-invalid"), "Reset the form, user-interacted flag is reset");
+}, ":user-valid selector properly interacts with submit & reset buttons");
 </script>
diff --git a/tests/wpt/tests/docs/writing-tests/testharness.md b/tests/wpt/tests/docs/writing-tests/testharness.md
index fd4450f4403..e88d5741ca6 100644
--- a/tests/wpt/tests/docs/writing-tests/testharness.md
+++ b/tests/wpt/tests/docs/writing-tests/testharness.md
@@ -212,7 +212,7 @@ Use `// META: timeout=long` at the beginning of the resource.
 Use `// META: variant=url-suffix` at the beginning of the resource. For example,
 
 ```
-// META: variant=
+// META: variant=?default
 // META: variant=?wss
 ```
 
@@ -222,7 +222,7 @@ A test file can have multiple variants by including `meta` elements,
 for example:
 
 ```html
-<meta name="variant" content="">
+<meta name="variant" content="?default">
 <meta name="variant" content="?wss">
 ```
 
diff --git a/tests/wpt/tests/dpub-aam/META.yml b/tests/wpt/tests/dpub-aam/META.yml
index a382778f375..5552a2e82eb 100644
--- a/tests/wpt/tests/dpub-aam/META.yml
+++ b/tests/wpt/tests/dpub-aam/META.yml
@@ -1,4 +1,3 @@
 spec: https://w3c.github.io/dpub-aam/
 suggested_reviewers:
-  - halindrome
-  - joanmarie
+  - spectranaut
diff --git a/tests/wpt/tests/dpub-aria/META.yml b/tests/wpt/tests/dpub-aria/META.yml
index c6e339af636..b27081355ab 100644
--- a/tests/wpt/tests/dpub-aria/META.yml
+++ b/tests/wpt/tests/dpub-aria/META.yml
@@ -1,3 +1,3 @@
 spec: https://w3c.github.io/dpub-aria/
 suggested_reviewers:
-  - halindrome
+  - spectranaut
diff --git a/tests/wpt/tests/fenced-frame/automatic-beacon-shared-storage.https.html b/tests/wpt/tests/fenced-frame/automatic-beacon-shared-storage.https.html
new file mode 100644
index 00000000000..a21e42a4881
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/automatic-beacon-shared-storage.https.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>Test window.fence.setReportEventDataForAutomaticBeacons from
+    SharedStorage</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="resources/utils.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<body>
+<script>
+promise_test(async(t) => {
+  const actions = new test_driver.Actions();
+  const fencedframe = await attachFencedFrameContext(
+      {generator_api: 'sharedstorage'});
+  const new_url = new URL("resources/dummy.html", location.href);
+  const beacon_data = "This is the beacon data!";
+
+  await fencedframe.execute((new_url, beacon_data) => {
+    addEventListener("click", (event) => {
+      let beacon_event = {
+        eventType: "reserved.top_navigation",
+        eventData: beacon_data,
+        destination: ["shared-storage-select-url"],
+      }
+      window.fence.setReportEventDataForAutomaticBeacons(beacon_event);
+      window.open(new_url, "_blank");
+    });
+  }, [new_url, beacon_data]);
+
+  await actions.pointerMove(0, 0, {origin: fencedframe.element})
+               .pointerDown()
+               .pointerUp()
+               .send();
+
+  const received_beacon_data = await nextAutomaticBeacon();
+  assert_equals(received_beacon_data, beacon_data);
+}, 'Set and trigger an automatic beacon in a click handler for SharedStorage');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/fenced-frame/automatic-beacon-unfenced-top.https.html b/tests/wpt/tests/fenced-frame/automatic-beacon-unfenced-top.https.html
new file mode 100644
index 00000000000..49c4ba84e08
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/automatic-beacon-unfenced-top.https.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<title>Test automatic beacons sent from an '_unfencedTop' navigation</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="resources/utils.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<body>
+<script>
+// The actual test is not in this file. Instead, this file sets up a fenced
+// frame with automatic beacon data. It then causes the fenced frame to do an
+// '_unfencedTop' navigation, which will cause the automatic beacon to send. The
+// page that's navigated through '_unfencedTop' hosts the test, which simply
+// checks that the automatic beacon was sent when the navigation happened.
+//
+// The reason we do this is because an '_unfencedTop' navigation replaces this
+// page, so any test running here will stop. Other tests get around this by
+// loading the test in a pop-up, but that doesn't allow the page to receive
+// click events through test_driver.Actions().
+async function init() {
+  const actions = new test_driver.Actions();
+  const fencedframe = await attachFencedFrameContext(
+    {generator_api: 'fledge', automatic_beacon: true});
+  const new_url = new URL("resources/automatic-beacon-unfenced-page.html",
+      location.href);
+
+  await fencedframe.execute((new_url) => {
+    const beacon_data = "This is the beacon data!";
+    let beacon_event = {
+      eventType: "reserved.top_navigation",
+      eventData: beacon_data,
+      destination: ["buyer"],
+    }
+    window.fence.setReportEventDataForAutomaticBeacons(beacon_event);
+    addEventListener("click", (event) => {
+      window.open(new_url, "_unfencedTop");
+    });
+  }, [new_url]);
+
+  await actions.setContext(window)
+               .pointerMove(0, 0, {origin: fencedframe.element})
+               .pointerDown()
+               .pointerUp()
+               .send();
+
+  // After this point, the top-level frame will be navigated to
+  // 'automatic-beacon-unfenced-page.html', which will verify that the automatic
+  // beacon was sent.
+}
+
+init();
+</script>
+</body>
diff --git a/tests/wpt/tests/fenced-frame/deep-copy-config.https.html b/tests/wpt/tests/fenced-frame/deep-copy-config.https.html
index 37b27a742b9..54a976233cb 100644
--- a/tests/wpt/tests/fenced-frame/deep-copy-config.https.html
+++ b/tests/wpt/tests/fenced-frame/deep-copy-config.https.html
@@ -76,6 +76,33 @@ promise_test(async(t) => {
   }, "The write should fail for a FencedFrameConfig.");
 }, 'A FencedFrameConfig cannot be written to storage.');
 
+promise_test(async(t) => {
+  const key = token();
+
+  // Create a fenced frame once the config comes in through postMessage.
+  window.addEventListener(
+    "message",
+    (event) => {
+      attachFencedFrame(event.data);
+    },
+    false,
+  );
+
+  // The pop-up will generate a FencedFrameConfig from a FLEDGE auction, and
+  // then pass it back into this page through postMessage(). Since config
+  // mappings are only valid within the same frame tree, this page will not be
+  // able to navigate a fenced frame to the config.
+  window.open(generateURL("resources/postmessage-config.html", [key]), "foo");
+
+  // Set up a timeout to ensure that there's enough time for any messages to be
+  // sent from a fenced frame if it loads.
+  const timeout = new Promise(resolve => t.step_timeout(resolve, 1000));
+  const result = await Promise.race([nextValueFromServer(key), timeout]);
+  assert_true(typeof result === "undefined",
+      "The fenced frame should not have loaded.");
+}, 'A FencedFrameConfig sent to a context that does not support it gracefully' +
+   ' fails to load.');
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/fenced-frame/resources/automatic-beacon-unfenced-page.html b/tests/wpt/tests/fenced-frame/resources/automatic-beacon-unfenced-page.html
new file mode 100644
index 00000000000..44f5df32e71
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/resources/automatic-beacon-unfenced-page.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>Page navigated to by an _unfencedTop navigation</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="utils.js"></script>
+
+<body>
+<script>
+  promise_test(async(t) => {
+    // This page is navigated to from an '_unfencedTop' navigation by
+    // '../automatic-beacon-unfenced-top.https.html'. An automatic beacon will
+    // have been sent as a result of the navigation.
+    const beacon_data = "This is the beacon data!";
+    const received_beacon_data = await nextAutomaticBeacon();
+    assert_equals(received_beacon_data, beacon_data);
+  });
+</script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py
index 73f4895cebe..85c78acb8bc 100644
--- a/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py
+++ b/tests/wpt/tests/fenced-frame/resources/fledge-bidding-logic.py
@@ -5,6 +5,8 @@
 # so we leave `reportWin` empty unless we need to call registerAdBeacon(). See
 # `generateURNFromFledge` in "utils.js" to see how this file is used.
 
+from wptserve.utils import isomorphic_decode
+
 def main(request, response):
   # Set up response headers.
   headers = [
@@ -13,10 +15,28 @@ def main(request, response):
   ]
 
   # Parse URL params.
+  requested_size = request.GET.first(b"requested-size", None)
   ad_with_size = request.GET.first(b"ad-with-size", None)
   automatic_beacon = request.GET.first(b"automatic-beacon", None)
 
-  # Use URL params to modify JS
+  # Use URL params to modify Javascript.
+  requested_size_check = ''
+  if requested_size is not None:
+    # request.GET stores URL keys and values in iso-8859-1 binary encoding. We
+    # have to decode the values back to a string to parse width/height. Don't
+    # bother sanitizing the size, because it is sanitized before auction logic
+    # runs already.
+    width, height = isomorphic_decode(requested_size).split('-')
+
+    requested_size_check = (
+      f'''
+        if (!(browserSignals.requestedSize.width === '{width}') &&
+             (browserSignals.requestedSize.height === '{height}')) {{
+          throw new Error('requestedSize missing/incorrect in browserSignals');
+        }}
+      '''
+    )
+
   render_obj = 'ad.renderUrl'
   if ad_with_size is not None:
     render_obj = '{ url: ad.renderUrl, width: "100px", height: "50px" }'
@@ -53,6 +73,7 @@ def main(request, response):
       perBuyerSignals,
       trustedBiddingSignals,
       browserSignals) {{
+        {requested_size_check}
         const ad = interestGroup.ads[0];
 
         // `auctionSignals` controls whether or not component auctions are
diff --git a/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py b/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py
index 028fe76efc0..bd615af835b 100644
--- a/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py
+++ b/tests/wpt/tests/fenced-frame/resources/fledge-decision-logic.py
@@ -5,6 +5,8 @@
 # `reportResult` empty. See `generateURNFromFledge` in "utils.js" to see how
 # this file is used.
 
+from wptserve.utils import isomorphic_decode
+
 def main(request, response):
   # Set up response headers.
   headers = [
@@ -12,9 +14,26 @@ def main(request, response):
     ('X-Allow-FLEDGE', 'true')
   ]
 
-  # TODO: Insert any code here that should be mutated based on URL parameters.
-  # Keep for now as a placeholder/example.
-  score_ad_content = ''
+  # Parse URL params.
+  requested_size = request.GET.first(b"requested-size", None)
+
+  # Use URL params to modify Javascript.
+  requested_size_check = ''
+  if requested_size is not None:
+    # request.GET stores URL keys and values in iso-8859-1 binary encoding. We
+    # have to decode the values back to a string to parse width/height. Don't
+    # bother sanitizing the size, because it is sanitized before auction logic
+    # runs already.
+    width, height = isomorphic_decode(requested_size).split('-')
+
+    requested_size_check = (
+      f'''
+        if (!(auctionConfig.requestedSize.width === '{width}') &&
+             (auctionConfig.requestedSize.height === '{height}')) {{
+          throw new Error('requestedSize missing/incorrect in auctionConfig');
+        }}
+      '''
+    )
 
   # Generate Javascript.
   # Note: Python fstrings use double-brackets ( {{, }} ) to insert bracket
@@ -26,18 +45,19 @@ def main(request, response):
       auctionConfig,
       trustedScoringSignals,
       browserSignals) {{
-        {score_ad_content}
+        {requested_size_check}
         return 2*bid;
       }}
     '''
   )
 
   report_result = (
-    '''function reportResult(
+    f'''function reportResult(
       auctionConfig,
-      browserSignals) {
+      browserSignals) {{
+        {requested_size_check}
         return;
-      }
+      }}
     '''
   )
 
diff --git a/tests/wpt/tests/fenced-frame/resources/postmessage-config.html b/tests/wpt/tests/fenced-frame/resources/postmessage-config.html
new file mode 100644
index 00000000000..3c201904200
--- /dev/null
+++ b/tests/wpt/tests/fenced-frame/resources/postmessage-config.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<script src="utils.js"></script>
+<title>A page opened in a pop-up that sends a FencedFrameConfig</title>
+<script>
+  async function init() {
+    const [key] = parseKeylist();
+
+    const config = await generateURNFromFledge(
+          "embeddee.html", [key], [], true);
+
+    window.opener.postMessage(config, "*");
+  }
+  init();
+</script>
diff --git a/tests/wpt/tests/fenced-frame/resources/utils.js b/tests/wpt/tests/fenced-frame/resources/utils.js
index d812736cdc2..a402dfdde4a 100644
--- a/tests/wpt/tests/fenced-frame/resources/utils.js
+++ b/tests/wpt/tests/fenced-frame/resources/utils.js
@@ -36,10 +36,11 @@ async function runSelectRawURL(href, resolve_to_config = false) {
     // gracefully fail rather than bring the whole test down.
   }
   return await sharedStorage.selectURL(
-      'test-url-selection-operation', [{url: href}], {
+      'test-url-selection-operation', [{url: href,
+          reportingMetadata: {'reserved.top_navigation': BEACON_URL}}], {
         data: {'mockResult': 0},
         resolveToConfig: resolve_to_config,
-        keepAlive: true
+        keepAlive: true,
       });
 }
 
@@ -93,12 +94,16 @@ async function generateURNFromFledgeRawURL(
         adComponents: ad_components_list,
       };
 
-  let params = new URLSearchParams(interestGroup.biddingLogicUrl.search);
+  let biddingUrlParams =
+      new URLSearchParams(interestGroup.biddingLogicUrl.search);
+  if (requested_size)
+    biddingUrlParams.set(
+        'requested-size', requested_size[0] + '-' + requested_size[1]);
   if (ad_with_size)
-    params.set('ad-with-size', 1);
+    biddingUrlParams.set('ad-with-size', 1);
   if (automatic_beacon)
-    params.set('automatic-beacon', 1);
-  interestGroup.biddingLogicUrl.search = params;
+    biddingUrlParams.set('automatic-beacon', 1);
+  interestGroup.biddingLogicUrl.search = biddingUrlParams;
 
   if (ad_with_size) {
     interestGroup.ads[0].sizeGroup = 'group1';
@@ -117,9 +122,17 @@ async function generateURNFromFledgeRawURL(
     auctionSignals: {biddingToken: bidding_token, sellerToken: seller_token},
     resolveToConfig: resolve_to_config
   };
+
   if (requested_size) {
+    let decisionUrlParams =
+      new URLSearchParams(auctionConfig.decisionLogicUrl.search);
+    decisionUrlParams.set(
+        'requested-size', requested_size[0] + '-' + requested_size[1]);
+    auctionConfig.decisionLogicUrl.search = decisionUrlParams;
+
     auctionConfig['requestedSize'] = {width: requested_size[0], height: requested_size[1]};
   }
+
   return navigator.runAdAuction(auctionConfig);
 }
 
diff --git a/tests/wpt/tests/file-system-access/showPicker-errors.https.window.js b/tests/wpt/tests/file-system-access/showPicker-errors.https.window.js
index ed66e1093b1..b2eeed90210 100644
--- a/tests/wpt/tests/file-system-access/showPicker-errors.https.window.js
+++ b/tests/wpt/tests/file-system-access/showPicker-errors.https.window.js
@@ -86,6 +86,12 @@ function define_file_picker_error_tests(showPickerMethod) {
     }));
   }, showPickerMethod + ': unknown well-known starting directory.');
 
+  promise_test(async t => {
+    await promise_rejects_js(t, TypeError, self[showPickerMethod]({
+                               startIn: '',
+                             }));
+  }, showPickerMethod + ': starting directory can\t be empty.');
+
   promise_test(async t => {
     await promise_rejects_js(t, TypeError, self[showPickerMethod]({
                                startIn: null,
diff --git a/tests/wpt/tests/fledge/tentative/TODO b/tests/wpt/tests/fledge/tentative/TODO
index 96654d2c592..fc2c296762c 100644
--- a/tests/wpt/tests/fledge/tentative/TODO
+++ b/tests/wpt/tests/fledge/tentative/TODO
@@ -18,8 +18,7 @@ Need tests for (likely not a complete list):
     loading URNs in fencedframes in other frames, loading component
     ad URNs in fenced frames of other frames, etc)
 * adAuctionConfig passed to reportResult().
-* trusted scoring signals.
-* Component ads.
+* Component ads (including scoring signals fetches).
 * Component auctions.
 * browserSignals fields in scoring/bidding methods.
 * In reporting methods, browserSignals fields: dataVersion, topLevelSeller,
diff --git a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
index d1d6d50e4b0..9b2b501fc72 100644
--- a/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/join-leave-ad-interest-group.https.sub.window.js
@@ -471,13 +471,15 @@ const SIMPLE_JOIN_LEAVE_TEST_CASES = [
   { expectJoinSucces: true,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     name: 'a'.repeat(1048528) },
+      name: 'a'.repeat(1048524)
+    },
     testCaseName: "Largest possible interest group dictionary",
   },
   { expectJoinSucces: false,
     expectLeaveSucces: true,
     interestGroup: { ...BASE_INTEREST_GROUP,
-                     name: 'a'.repeat(1048529) },
+      name: 'a'.repeat(1048525)
+    },
     testCaseName: "Oversized interest group dictionary",
   },
 ];
diff --git a/tests/wpt/tests/fledge/tentative/resources/fledge-util.js b/tests/wpt/tests/fledge/tentative/resources/fledge-util.js
index cd7bb7044c3..f941d2285d2 100644
--- a/tests/wpt/tests/fledge/tentative/resources/fledge-util.js
+++ b/tests/wpt/tests/fledge/tentative/resources/fledge-util.js
@@ -6,12 +6,15 @@ const BASE_PATH = (new URL(BASE_URL)).pathname;
 
 const DEFAULT_INTEREST_GROUP_NAME = 'default name';
 
-// Unlike other URLs, the trustedBiddingSignalsUrl can't have a query string
-// that's set by tests, since FLEDGE controls it entirely, so tests that
-// exercise it use a fixed URL string. Special keys and interest group names
-// control the response.
+// Unlike other URLs, trusted signals URLs can't have query strings
+// that are set by tests, since FLEDGE controls it entirely, so tests that
+// exercise them use a fixed URL string. Note that FLEDGE adds query
+// params when requesting these URLs, and the python scripts use these
+// to construct the response.
 const TRUSTED_BIDDING_SIGNALS_URL =
     `${BASE_URL}resources/trusted-bidding-signals.py`;
+const TRUSTED_SCORING_SIGNALS_URL =
+    `${BASE_URL}resources/trusted-scoring-signals.py`;
 
 // Creates a URL that will be sent to the URL request tracker script.
 // `uuid` is used to identify the stash shard to use.
@@ -99,7 +102,11 @@ async function waitForObservedRequests(uuid, expectedRequests) {
     // all expected requests and exit.
     let trackedRequests = trackerData.trackedRequests;
     if (trackedRequests.length == expectedRequests.length) {
-      assert_array_equals(trackedRequests.sort(), expectedRequests);
+      // Hide the uuid content in order to have a static expected file.
+      assert_array_equals(trackedRequests.sort().map((url) =>
+                            url.replace(uuid, '<uuid>')),
+                            expectedRequests.map((url) =>
+                            url.replace(uuid, '<uuid>')));
       break;
     }
 
@@ -107,7 +114,9 @@ async function waitForObservedRequests(uuid, expectedRequests) {
     // compare what's been received so far, to have a greater chance to fail
     // rather than hang on error.
     for (const trackedRequest of trackedRequests) {
-      assert_in_array(trackedRequest, expectedRequests);
+      assert_in_array(trackedRequest.replace(uuid, '<uuid>'),
+                      expectedRequests.sort().map((url) =>
+                      url.replace(uuid, '<uuid>')));
     }
   }
 }
@@ -153,11 +162,14 @@ function createDecisionScriptUrl(uuid, params = {}) {
 // Creates a renderUrl for an ad that runs the passed in "script". "uuid" has
 // no effect, beyond making the URL distinct between tests, and being verified
 // by the decision logic script before accepting a bid. "uuid" is expected to
-// be last.
-function createRenderUrl(uuid, script) {
+// be last.  "signalsParams" also has no effect, but is used by
+// trusted-scoring-signals.py to affect the response.
+function createRenderUrl(uuid, script, signalsParams) {
   let url = new URL(`${BASE_URL}resources/fenced-frame.sub.py`);
   if (script)
     url.searchParams.append('script', script);
+  if (signalsParams)
+    url.searchParams.append('signalsParams', signalsParams);
   url.searchParams.append('uuid', uuid);
   return url.toString();
 }
@@ -239,10 +251,10 @@ async function runBasicFledgeAuctionAndNavigate(test, uuid,
 }
 
 // Joins an interest group and runs an auction, expecting a winner to be
-// returned. "testConfig" can optionally modify the interest group or
+// returned. "testConfig" can optionally modify the uuid, interest group or
 // auctionConfig.
 async function runBasicFledgeTestExpectingWinner(test, testConfig = {}) {
-  const uuid = generateUuid(test);
+  const uuid = testConfig.uuid ? testConfig.uuid : generateUuid(test);
   await joinInterestGroup(test, uuid, testConfig.interestGroupOverrides);
   let config = await runBasicFledgeAuction(
       test, uuid, testConfig.auctionConfigOverrides);
@@ -251,10 +263,10 @@ async function runBasicFledgeTestExpectingWinner(test, testConfig = {}) {
 }
 
 // Joins an interest group and runs an auction, expecting no winner to be
-// returned. "testConfig" can optionally modify the interest group or
+// returned. "testConfig" can optionally modify the uuid, interest group or
 // auctionConfig.
 async function runBasicFledgeTestExpectingNoWinner(test, testConfig = {}) {
-  const uuid = generateUuid(test);
+  const uuid = testConfig.uuid ? testConfig.uuid : generateUuid(test);
   await joinInterestGroup(test, uuid, testConfig.interestGroupOverrides);
   let result = await runBasicFledgeAuction(
       test, uuid, testConfig.auctionConfigOverrides);
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 cdd7052a96a..9602bd22f96 100644
--- a/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
+++ b/tests/wpt/tests/fledge/tentative/resources/trusted-bidding-signals.py
@@ -50,7 +50,7 @@ def main(request, response):
     body = None
 
     contentType = "application/json"
-    xAllowFledge = "true"
+    adAuctionAllowed = "true"
     dataVersion = None
     if keys:
         for key in keys:
@@ -74,14 +74,12 @@ def main(request, response):
                 contentType = None
             elif key == "wrong-content-type":
                 contentType = 'text/plain'
-            elif key == "wrongContentType":
-                contentType = 'text/plain'
-            elif key == "bad-allow-fledge":
-                xAllowFledge = "sometimes"
-            elif key == "fledge-not-allowed":
-                xAllowFledge = "false"
-            elif key == "no-allow-fledge":
-                xAllowFledge = None
+            elif key == "bad-ad-auction-allowed":
+                adAuctionAllowed = "sometimes"
+            elif key == "ad-auction-not-allowed":
+                adAuctionAllowed = "false"
+            elif key == "no-ad-auction-allow":
+                adAuctionAllowed = None
             elif key == "no-value":
                 continue
             elif key == "wrong-value":
@@ -108,8 +106,8 @@ def main(request, response):
 
     if contentType:
         response.headers.set("Content-Type", contentType)
-    if xAllowFledge:
-        response.headers.set("X-Allow-FLEDGE", xAllowFledge)
+    if adAuctionAllowed:
+        response.headers.set("Ad-Auction-Allowed", adAuctionAllowed)
     if dataVersion:
         response.headers.set("Data-Version", dataVersion)
     response.headers.set("X-fledge-bidding-signals-format-version", "2")
diff --git a/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py b/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
new file mode 100644
index 00000000000..6036d2ef4d1
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/resources/trusted-scoring-signals.py
@@ -0,0 +1,127 @@
+import json
+from urllib.parse import unquote_plus, urlparse
+
+# Script to generate trusted scoring signals. The responses depends on the
+# query strings in the ads Urls - some result in entire response failures,
+# others affect only their own value. Each renderUrl potentially has a
+# signalsParam, which is a comma-delimited list of instructions that can
+# each affect either the value associated with the renderUrl, or the
+# response as a whole.
+def main(request, response):
+    hostname = None
+    renderUrls = None
+    adComponentRenderUrls = None
+
+    # Manually parse query params. Can't use request.GET because it unescapes as well as splitting,
+    # and commas mean very different things from escaped commas.
+    for param in request.url_parts.query.split("&"):
+        pair = param.split("=", 1)
+        if len(pair) != 2:
+            return fail(response, "Bad query parameter: " + param)
+        # Browsers should escape query params consistently.
+        if "%20" in pair[1]:
+            return fail(response, "Query parameter should escape using '+': " + param)
+
+        # 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:
+            hostname = pair[1]
+            continue
+        if pair[0] == "renderUrls" and renderUrls == None:
+            renderUrls = list(map(unquote_plus, pair[1].split(",")))
+            continue
+        if pair[0] == "adComponentRenderUrls" and adComponentRenderUrls == None:
+            adComponentRenderUrls = list(map(unquote_plus, pair[1].split(",")))
+            continue
+        return fail(response, "Unexpected query parameter: " + param)
+
+    # "hostname" and "renderUrls" are mandatory.
+    if not hostname:
+        return fail(response, "hostname missing")
+    if not renderUrls:
+        return fail(response, "renderUrls missing")
+
+    response.status = (200, b"OK")
+
+    # The JSON representation of this is used as the response body.
+    responseBody = {"renderUrls": {}}
+
+    # Set when certain special keys are observed, used in place of the JSON
+    # representation of `responseBody`, when set.
+    body = None
+
+    contentType = "application/json"
+    adAuctionAllowed = "true"
+    dataVersion = None
+    if renderUrls:
+        for renderUrl in renderUrls:
+            value = "default value"
+
+            signalsParams = None
+            for param in urlparse(renderUrl).query.split("&"):
+                pair = param.split("=", 1)
+                if len(pair) != 2:
+                    continue
+                if pair[0] == "signalsParams":
+                    if signalsParams != None:
+                        return fail(response, "renderUrl has multiple signalsParams: " + renderUrl)
+                    signalsParams = pair[1]
+            if signalsParams != None:
+                signalsParams = unquote_plus(signalsParams)
+                for signalsParam in signalsParams.split(","):
+                    if signalsParam == "close-connection":
+                        # Close connection without writing anything, to simulate a
+                        # network error. The write call is needed to avoid writing the
+                        # default headers.
+                        response.writer.write("")
+                        response.close_connection = True
+                        return
+                    elif signalsParam.startswith("replace-body:"):
+                        # Replace entire response body. Continue to run through other
+                        # renderUrls, to allow them to modify request headers.
+                        body = signalsParam.split(':', 1)[1]
+                    elif signalsParam.startswith("data-version:"):
+                        dataVersion = signalsParam.split(':', 1)[1]
+                    elif signalsParam == "http-error":
+                        response.status = (404, b"Not found")
+                    elif signalsParam == "no-content-type":
+                        contentType = None
+                    elif signalsParam == "wrong-content-type":
+                        contentType = 'text/plain'
+                    elif signalsParam == "bad-ad-auction-allowed":
+                        adAuctionAllowed = "sometimes"
+                    elif signalsParam == "ad-auction-not-allowed":
+                        adAuctionAllowed = "false"
+                    elif signalsParam == "no-ad-auction-allow":
+                        adAuctionAllowed = None
+                    elif signalsParam == "no-value":
+                        continue
+                    elif signalsParam == "null-value":
+                        value = None
+                    elif signalsParam == "num-value":
+                        value = 1
+                    elif signalsParam == "string-value":
+                        value = "1"
+                    elif signalsParam == "array-value":
+                        value = [1, "foo", None]
+                    elif signalsParam == "object-value":
+                        value = {"a":"b", "c":["d"]}
+                    elif signalsParam == "hostname":
+                        value = request.GET.first(b"hostname", b"not-found").decode("ASCII")
+            if value != None:
+                responseBody["renderUrls"][renderUrl] = value
+
+    if contentType:
+        response.headers.set("Content-Type", contentType)
+    if adAuctionAllowed:
+        response.headers.set("Ad-Auction-Allowed", adAuctionAllowed)
+    if dataVersion:
+        response.headers.set("Data-Version", dataVersion)
+
+    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.sub.window.js b/tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js
new file mode 100644
index 00000000000..252e4db00fb
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/round-a-value.https.sub.window.js
@@ -0,0 +1,160 @@
+// META: script=/resources/testdriver.js
+// META: script=/common/utils.js
+// META: script=resources/fledge-util.js
+// META: timeout=long
+
+"use strict;"
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'adCost': 1.99,
+                 'bid': 9,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        // Possible stochastic rounding results for 1.99
+        `browserSignals.adCost === 1.9921875 || browserSignals.adCost === 1.984375`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Check adCost is stochastically rounded with 8 bit mantissa and exponent.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'bid': 1.99,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        // Possible stochastic rounding results for 1.99
+        `browserSignals.bid === 1.9921875 || browserSignals.bid === 1.984375`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Check bid is stochastically rounded with 8 bit mantissa and exponent.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { scoreAd:
+        `return {desirability: 1.99,
+                 allowComponentAuction: false}`,
+      reportResultSuccessCondition:
+        // Possible stochastic rounding results for 1.99
+        `browserSignals.desirability === 1.9921875 || browserSignals.desirability === 1.984375`,
+      reportResult:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Check desirability is stochastically rounded with 8 bit mantissa and exponent.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await joinInterestGroup(test, uuid,
+    { biddingLogicUrl: createBiddingScriptUrl({ bid: 1.99 }),
+      name: 'other interest group 1' });
+  await runReportTest(
+    test, uuid,
+    { reportResultSuccessCondition:
+        // Possible stochastic rounding results for 1.99
+        `browserSignals.highestScoringOtherBid === 1.9921875 || browserSignals.highestScoringOtherBid === 1.984375`,
+      reportResult:
+      `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Check highestScoringOtherBid is stochastically rounded with 8 bit mantissa and exponent.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'adCost': 2,
+                 'bid': 9,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        `browserSignals.adCost === 2`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Value is ignored as a non-valid floating-point number.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'adCost': 1E-46,
+                 'bid': 9,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        `browserSignals.adCost === 0`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Value is rounded to 0 if value is greater than 0 and its exponent is less than -128.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'adCost': -1E-46,
+                 'bid': 9,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        `browserSignals.adCost === -0`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Value is rounded to -0 if value is greater than 0 and its exponent is less than -128.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'adCost': 1E+39,
+                 'bid': 9,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        `browserSignals.adCost === Infinity`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Value is rounded to Infinity if value is greater than 0 and its exponent is greater than 127.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  await runReportTest(
+    test, uuid,
+    { generateBid:
+        `return {'adCost': -1E+39,
+                 'bid': 9,
+                 'render': interestGroup.ads[0].renderUrl};`,
+      reportWinSuccessCondition:
+        `browserSignals.adCost === -Infinity`,
+      reportWin:
+        `sendReportTo('${createBidderReportUrl(uuid)}');` },
+    // expectedReportUrls
+    [createBidderReportUrl(uuid)]
+  );
+}, 'Value is rounded to -Infinity if value is less than 0 and its exponent is greater than 127.');
diff --git a/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js b/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js
index 0f8b2396392..90c1c39fd6e 100644
--- a/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js
+++ b/tests/wpt/tests/fledge/tentative/trusted-bidding-signals.https.sub.window.js
@@ -111,23 +111,23 @@ promise_test(async test => {
 promise_test(async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
-      { trustedBiddingSignalsKeys: ['fledge-not-allowed'],
+      { trustedBiddingSignalsKeys: ['ad-auction-not-allowed'],
         trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
 }, 'Trusted bidding signals response does not allow fledge.');
 
 promise_test(async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
-      { trustedBiddingSignalsKeys: ['bad-allow-fledge'],
+      { trustedBiddingSignalsKeys: ['bad-ad-auction-allowed'],
         trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'Trusted bidding signals response has wrong X-Allow-FLEDGE header.');
+}, 'Trusted bidding signals response has wrong Ad-Auction-Allowed header.');
 
 promise_test(async test => {
   await runTrustedBiddingSignalsTest(
       test, 'trustedBiddingSignals === null',
-      { trustedBiddingSignalsKeys: ['no-allow-fledge'],
+      { trustedBiddingSignalsKeys: ['no-ad-auction-allow'],
         trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'Trusted bidding signals response has no X-Allow-FLEDGE header.');
+}, 'Trusted bidding signals response has no Ad-Auction-Allowed header.');
 
 promise_test(async test => {
   await runTrustedBiddingSignalsTest(
@@ -197,7 +197,7 @@ promise_test(async test => {
       test, 'trustedBiddingSignals["null-value"] === null',
       { trustedBiddingSignalsKeys: ['null-value'],
         trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'Trusted bidding signals response null value for key.');
+}, 'Trusted bidding signals response has null value for key.');
 
 promise_test(async test => {
   await runTrustedBiddingSignalsTest(
@@ -316,7 +316,7 @@ promise_test(async test => {
       'browserSignals.dataVersion === undefined',
       { trustedBiddingSignalsKeys: ['num-value'],
         trustedBiddingSignalsUrl: TRUSTED_BIDDING_SIGNALS_URL });
-}, 'Trusted bidding signals response has no data-version.');
+}, 'Trusted bidding signals response has no Data-Version.');
 
 promise_test(async test => {
   await runTrustedBiddingSignalsDataVersionTest(
diff --git a/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js
new file mode 100644
index 00000000000..94385fd731a
--- /dev/null
+++ b/tests/wpt/tests/fledge/tentative/trusted-scoring-signals.https.sub.window.js
@@ -0,0 +1,409 @@
+// META: script=/resources/testdriver.js
+// META: script=/common/utils.js
+// META: script=resources/fledge-util.js
+// META: timeout=long
+
+"use strict";
+
+// These tests focus on trustedScoringSignals: Requesting them, handling network
+// errors, handling the renderURLs portion of the response, passing renderURLs
+// to worklet scripts, and handling the Data-Version header.
+
+// Helper for trusted scoring signals tests. Runs an auction with
+// TRUSTED_SCORING_SIGNALS_URL and a single interest group, failing the test
+// if there's no winner. "scoreAdCheck" is an expression that should be true
+// when evaluated in scoreAd(). "renderURL" can be used to control the response
+// given for TRUSTED_SCORING_SIGNALS_URL.
+async function runTrustedScoringSignalsTest(test, uuid, renderURL, scoreAdCheck) {
+  const auctionConfigOverrides = {
+      trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL,
+      decisionLogicUrl:
+          createDecisionScriptUrl(uuid, {
+              scoreAd: `if (!(${scoreAdCheck})) throw "error";` })};
+  await runBasicFledgeTestExpectingWinner(
+      test,
+      { uuid: uuid,
+        interestGroupOverrides: {ads: [{renderUrl: renderURL}]},
+        auctionConfigOverrides: auctionConfigOverrides
+      });
+}
+
+// Much like runTrustedScoringSignalsTest, but runs auctions through reporting
+// as well, and evaluates `check` both in scodeAd() and reportResult(). Also
+// makes sure browserSignals.dataVersion is undefined in generateBid() and
+// reportWin().
+async function runTrustedScoringSignalsDataVersionTest(
+    test, uuid, renderURL, check) {
+  const interestGroupOverrides = {
+      biddingLogicUrl :
+          createBiddingScriptUrl({
+              generateBid:
+                  `if (browserSignals.dataVersion !== undefined)
+                      throw "Bad browserSignals.dataVersion"`,
+              reportWin:
+                  `if (browserSignals.dataVersion !== undefined)
+                     sendReportTo('${createSellerReportUrl(uuid, '1-error')}');
+                   else
+                     sendReportTo('${createSellerReportUrl(uuid, '1')}');`}),
+      ads: [{renderUrl: renderURL}]};
+  await joinInterestGroup(test, uuid, interestGroupOverrides);
+
+  const auctionConfigOverrides = {
+    decisionLogicUrl: createDecisionScriptUrl(
+        uuid,
+        { scoreAd:
+              `if (!(${check})) return false;`,
+          reportResult:
+              `if (!(${check}))
+                 sendReportTo('${createSellerReportUrl(uuid, '2-error')}')
+               sendReportTo('${createSellerReportUrl(uuid, '2')}')`,
+        }),
+        trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL
+  }
+  await runBasicFledgeAuctionAndNavigate(test, uuid, auctionConfigOverrides);
+  await waitForObservedRequests(
+      uuid, [createSellerReportUrl(uuid, '1'), createSellerReportUrl(uuid, '2')]);
+}
+
+// Creates a render URL that, when sent to the trusted-scoring-signals.py,
+// results in a trusted scoring signals response with the provided response
+// body.
+function createScoringSignalsRenderUrlWithBody(uuid, responseBody) {
+  return createRenderUrl(uuid, /*script=*/null,
+                         /*signalsParam=*/`replace-body:${responseBody}`);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Tests where no renderURL value is received for the passed in renderURL.
+/////////////////////////////////////////////////////////////////////////////
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const decisionLogicScriptUrl = createDecisionScriptUrl(
+      uuid,
+      { scoreAd: 'if (trustedScoringSignals !== null) throw "error";'});
+  await runBasicFledgeTestExpectingWinner(
+      test,
+      { uuid: uuid,
+        auctionConfigOverrides: { decisionLogicUrl: decisionLogicScriptUrl }
+      });
+}, 'No trustedScoringSignalsUrl.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'close-connection');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      'trustedScoringSignals === null');
+}, 'Trusted scoring signals closes the connection without sending anything.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'http-error');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response is HTTP 404 error.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'no-content-type');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response has no content-type.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'wrong-content-type');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response has wrong content-type.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'ad-auction-not-allowed');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response does not allow FLEDGE.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'bad-ad-auction-allowed');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response has wrong Ad-Auction-Allowed header.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'no-ad-auction-allow');
+  await runTrustedScoringSignalsTest( test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response has no Ad-Auction-Allowed header.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response has no body.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'Not JSON');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response is not JSON.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'[]');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response is a JSON array.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'{JSON_keys_need_quotes: 1}');
+  await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
+}, 'Trusted scoring signals response is invalid JSON object.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'{}');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === null`);
+}, 'Trusted scoring signals response has no renderUrl object.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'{"renderUrls":{}}');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === null`);
+}, 'Trusted scoring signals response has no renderUrls.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createScoringSignalsRenderUrlWithBody(
+      uuid, /*responseBody=*/'{"renderUrls":{"https://wrong-url.test": 5}}');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === null &&
+       trustedScoringSignals["https://wrong-url.test/"] === undefined`);
+}, 'Trusted scoring signals response has renderURL not in response.');
+
+/////////////////////////////////////////////////////////////////////////////
+// Tests where renderURL value is received for the passed in renderURL.
+/////////////////////////////////////////////////////////////////////////////
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'null-value');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === null`);
+}, 'Trusted scoring signals response has null value for renderURL.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'num-value');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === 1`);
+}, 'Trusted scoring signals response has a number value for renderURL.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null,
+      /*signalsParam=*/'string-value');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === "1"`);
+}, 'Trusted scoring signals response has a string value for renderURL.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'array-value');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `JSON.stringify(trustedScoringSignals.renderURL["${renderURL}"]) === '[1,"foo",null]'`);
+}, 'Trusted scoring signals response has an array value for renderURL.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'object-value');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `Object.keys(trustedScoringSignals.renderURL["${renderURL}"]).length  === 2 &&
+      trustedScoringSignals.renderURL["${renderURL}"]["a"] === "b" &&
+       JSON.stringify(trustedScoringSignals.renderURL["${renderURL}"]["c"]) === '["d"]'`);
+}, 'Trusted scoring signals response has an object value for renderURL.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'+%20 \x00?,3#&');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === "default value"`);
+}, 'Trusted scoring signals with escaped renderURL.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'hostname');
+  await runTrustedScoringSignalsTest(
+      test, uuid, renderURL,
+      `trustedScoringSignals.renderURL["${renderURL}"] === "${window.location.hostname}"`);
+}, 'Trusted scoring signals receives hostname field.');
+
+// Joins two interest groups and makes sure the scoring signals for one are never leaked
+// to the seller script when scoring the other.
+//
+// There's no guarantee in this test that a single request to the server will be made with
+// render URLs from two different IGs, though that's the case this is trying to test -
+// browsers are not required to support batching, and even if they do, joining any two
+// particular requests may be racy.
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL1 = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'num-value');
+  const renderURL2 = createRenderUrl(uuid, /*script=*/null, /*signalsParam=*/'string-value');
+  await joinInterestGroup(test, uuid, {ads: [{renderUrl: renderURL1}], name: '1'});
+  await joinInterestGroup(test, uuid, {ads: [{renderUrl: renderURL2}], name: '2'});
+  let auctionConfigOverrides = { trustedScoringSignalsUrl: TRUSTED_SCORING_SIGNALS_URL };
+
+  // scoreAd() only accepts the first IG's bid, validating its trustedScoringSignals.
+  auctionConfigOverrides.decisionLogicUrl =
+        createDecisionScriptUrl(uuid, {
+            scoreAd: `if (browserSignals.renderURL === "${renderURL1}" &&
+                          trustedScoringSignals.renderURL["${renderURL1}"] !== 1 ||
+                          trustedScoringSignals.renderURL["${renderURL2}"] !== undefined)
+                        return;` });
+  let config = await runBasicFledgeAuction(
+      test, uuid, auctionConfigOverrides);
+  assert_true(config instanceof FencedFrameConfig,
+      `Wrong value type returned from first auction: ${config.constructor.type}`);
+
+  // scoreAd() only accepts the second IG's bid, validating its trustedScoringSignals.
+  auctionConfigOverrides.decisionLogicUrl =
+        createDecisionScriptUrl(uuid, {
+            scoreAd: `if (browserSignals.renderURL === "${renderURL2}" &&
+                          trustedScoringSignals.renderURL["${renderURL1}"] !== undefined ||
+                          trustedScoringSignals.renderURL["${renderURL2}"] !== '1')
+                        return;` });
+  config = await runBasicFledgeAuction(
+      test, uuid, auctionConfigOverrides);
+  assert_true(config instanceof FencedFrameConfig,
+      `Wrong value type returned from second auction: ${config.constructor.type}`);
+}, 'Trusted scoring signals multiple renderURLs.');
+
+/////////////////////////////////////////////////////////////////////////////
+// Data-Version tests
+/////////////////////////////////////////////////////////////////////////////
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid);
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has no Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === 3');
+}, 'Trusted scoring signals response has valid Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:0');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === 0');
+}, 'Trusted scoring signals response has min Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:4294967295');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === 4294967295');
+}, 'Trusted scoring signals response has max Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:4294967296');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has too large Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:03');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has data-version with leading 0.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:-1');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has negative Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:1.3');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has decimal in Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:2 2');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has space in Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:0x4');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has hex Data-Version.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has data-version and empty body.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:[]');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has data-version and JSON array body.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:{} {}');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === undefined');
+}, 'Trusted scoring signals response has data-version and double JSON object body.');
+
+promise_test(async test => {
+  const uuid = generateUuid(test);
+  const renderURL = createRenderUrl(uuid, /*script=*/null, 'data-version:3,replace-body:{}');
+  await runTrustedScoringSignalsDataVersionTest(
+      test, uuid, renderURL,
+      'browserSignals.dataVersion === 3');
+}, 'Trusted scoring signals response has data-version and no renderURLs.');
diff --git a/tests/wpt/tests/fonts/CanvasTest-ascent256.ttf b/tests/wpt/tests/fonts/CanvasTest-ascent256.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..d5924fc2194a3ae0d9a4eca3c293b14909b2a44e
GIT binary patch
literal 2444
zcmds2-)j_C6#nka>})n_RB9T*Z5h+pB*pA*Hl?8<E!8B8VuB%V@*vVU?2eg*-I-x`
zHZf4pf(088p|q5~_eop9_)uGXC{k-E77^@|7JO)FX{+?X_MzQm``y`zE>i!1_TIg7
z&iT&Id*;qw2moz32^B~8?m0B}*UL&8i1iTNm&s%&rmrroQ1&Rt4<1UU4|mx&0bx@<
znk$*!4!`XH<)68Z<mP<?oyuuI9i?8IGb>)b&d7)vlw0PCi^tmDU!bj;2b8yL%go0f
z{&|hM-?(0}3B<g$ON`Y;xyvs3$F&K}Q(mEL6y2PuUeQj`e;?&|$vp013KP^z*>KE~
z)%(Nu-vN<(jDOd2EB^Mb=M<*CLVX@`uUrp0et&It^Y9<opb-GBUs$^=>AfE><!kM=
zJNj<@7R46OGZ^&IZ`JPLh=yAG>TP{@5Ghm!L=BKlh|Aq_NKX-9Zy*sMng;O@5vo2?
zZV)-!pyF2yh?sQH`3#4w^U;_*HkQYih+#~i4jj>Msk^8QY!sQ!-~@NlDP2h8kER4T
zYV84$mB|%v_+o~Vj1s5Q5NS)e<4ue=#`nh8MsAPf>Oa-5)3$|}94b8`(B&?L9+pB_
zs9Ho{?^$3dK_I%$KaIA;S~qNbn({w@2WK8HagO3m9LIb3g!6M;!{4G`yv{!H-H5bu
zj-87laZw;Syd2eVKYdY;+#Oz46|%UfN;o3n<)|)d!^=YA16y})?H<_rLZ{gB;KmK*
z-0DoHa!mF$F5=>*avvLjX9hb4JE9%Y?r8U5JahKM^vR{kcjphd%Bk5iA5MR8dUk2)
zFh86BpAQd*CJ!}#Y|~DDpJZ2qQ&*SYLZImnH9W|)tKHG~HM47*v4e(9ofEW+thcdy
zutRKbYUSEd8C)r@xAt`AtZp}TceS&I?0T!0X3sEJt-TI?H&Z?(muSjWYj4V>=47tO
zw@tak)uvoxh1)#XoQz+Y-0zc}sL2kr;ez}MgHh$P!3(sa8uI+}!HJMp@gm*{d9BGN
z!hW3(aXrBK@1e>6tY7d26H8uToA@~76>JojLte$W_$uVJCYuPJSGI(>F7Xl9TPzpm
zY~Sd~^&06^f6AD&3&nzGWX;8*TTZmLPFY3EtXO%Y>g27m;oFumu|I2!7jl+Uv4#xW
z_r0NHa$#X1;d+GJYB^^m-11zq*f6OiO9j6#6cV28jhN27S;<-zf5OTas-=wU_!&A_
zMmmu)hK$F03hBYVbe}A2#wu3|u4AN9{fSg6g%P;$u!u4Wn1c-;26~V~FKHSn^m7@Q
zq^5u(mq#fJlO9ESmU&CGa!$dbY!R>UnWs$^4yi>8gE4J#25-Fm^ffTfI5{FtU_C@c
z=JgqS2uaR`U?zgf8dfgjl>;A%mRV^ssOE8$3Xu}y`sjN?lVDt%YlPJ~yp?5*S!S=$
zc7ilduPS{rjO-ATRA!JBr@245e_7+d`8PCa3^HpvSdEU&(7VhGg&?NE7!sGU<P7hc
z`r8<IbgqMA9zHfnR476fnuzeGQqhH7Jm1~uiB_EgU)yL%Uk&M=knRoXh>XA+Pzg@H
zy#F*j3(Yp2xkBD@OQvs^-I4<_ni<dXe&lV)A@9eH*n(}?4*rMJ_ay7!3beuVYwNRb
Pq;&n$+fxC(uy+0*4?MMY

literal 0
HcmV?d00001

diff --git a/tests/wpt/tests/fonts/CanvasTest-descent0.ttf b/tests/wpt/tests/fonts/CanvasTest-descent0.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5887c0de8ddc89e4dcfa9027fa44a2d8a631c465
GIT binary patch
literal 2444
zcmds2-)|H}9RJMj-d?Xjfk-We(=4UfV(8uVYHVy8BecChXhTzuKA6UGxm&uI+}&>O
z_F9^lfC(np1WAm>`0f)Z3FSdBJQ$)v42F>4Q!(K|qoU{w`k>dIpPAdjg~%VEGduhJ
zem~z|GvA%rfdJ5k6VP#F@18@Wf4!(Bfk+S0eW_G>{P5Mq>y$mp(SwKL$>|;Wn}BdA
zAITOo-ZsDO0Og-Jrn7Utg--1hppQ^*%w{THz0SypSd?343kyfv-kYbbo&&Tu96OVX
zJoxi>>VD;T$srK&RxdJE7v(Oe=pQr2F-Q42Wvk$3Gx`<dB>neMjutb=JWOJodMR6_
zOwr!;{deC2p}UNK$8#(G)~;tYroKXb4sxv=_nx``^UTJfKd{aq09-r2dP&l|KU{pL
z)?QmScbm5;wt$|h(Z{@1TgJ43TKmdvbGM2VC>7BavH?-KS~lq^6!t1&3NZ|b2MAI1
zp>~7FnFbZVpkG9!gUNT$<UAj?iKC-Ae2xf4Rp@E+mcElpWuwV-7CX3-PU%7#eb^<y
zR%=&8y2}x5_+pBZj1r~OAZbgm;th;9%J0U{MsAPf>Oa=6(YA${Y&tzcFy$(R8BB$+
z(2bC}Rx@QNK_I-wKZ&+PTGy?AlJY-*t38hw*hla>j^SN=%zhbP;&0I>USXa1ZA4N#
z%gTijyC4uBS_&JupS)m(?hGyI8d+S>B^;9QQrHx=p(P>l{>|GrclU4J(J40lcH@S2
zc4ewlJ1XlM6;W|hyN`9iQv)3X9pR2}cer~XnmTj*@QKBVx91MH+R2&I9~^%F)Xd`I
zYdkjpKOb%mLvCt5EYo(LPqHg&*VW}&P@29#!;MV4+OomZ%&Kj~HX1fnPS7s2R>tmu
z4zabVl&eQ%aILUb+Eb}Brqfj2mChQ{Yo%VCIn7+P_BzbnO!<UdqA6Fcy(yQTmAOLS
zH02Ukn{tWkT;{>%WISbZy^mL-CM(c}^YRp`R^_|F3$&sd@cjAUc);s;9&ZJ_(PR^1
zz0L)=sc`;14EfKxhtHT;@&a4LM***4y|@(cI>y8o0dF+fgz%iUDZovM54+w%IX~<8
zR!?@9l}z*{tO+My$a_{gvrur$vDVf}yI^N3cFwAna(3DB9orh;pSH&GS-VuR2QA0<
zy}@{VettgYdW76+Icvw<@@%}&Fsa0gdA~OhVxHp-XG(LKO4_dY<904zEvDR(pQ3|p
zC1VL|(0Zh&kR0eu_R5J(+2u;!Em?^~Uo4SGU>GhuETD`$X5qkxg&t(Fi!_M@`Zz31
zP?JZ2!=sc&h8_iamU&CGvQNUMY!k2Wouf?^B~qIf7GpZ(EZ%tg>1$z(ak4~8%6gE9
z%<D7uAmZ%vs>jsK8dfgjm6eY~%baOk&E`>*3Xvk?`sjU36JuP5W0<om@m7{|Of!3h
zw&SEZdR6J0V&oDrNo58(<0RK7*DvSzZ~hHU5(CVdRHIR`DSDTgA+KUuj3IFuOZMQd
zslSQ-hx=M>^We2XqCyk8Fhqzqm5wg#<o@nPPq<pj^RtZv^yPr=3FzK{4$BC<0X4Pr
z<^5;iX&6qXG@H-aZZYFKWw%&@7)gz#c|Y<tWRv&fdThcLYz6<}^gY3Oa44;Me`SCA
QwUn-Xa(hzI^Q-6n0o1j%b^rhX

literal 0
HcmV?d00001

diff --git a/tests/wpt/tests/fonts/CanvasTest.ttf b/tests/wpt/tests/fonts/CanvasTest.ttf
index 9023592ef5aa83a03dd6957398897a585062ca57..9cdd0faf10818614202d397bb70b97a51a311fd4 100644
GIT binary patch
delta 599
zcmYjN&ubGw6#m}MWSg}mskEhnv8*LV1+Cj2JgFD81auL!dJ5PjS-a70vbdXAMaV@#
zL_`?>1aCqwxm2m3qS%WTk)E`WgP^o}@ZibP__p0c8Q#qI<IOieIs=aeo(#7R0VqyR
zPT7~=K3oEffO+o1rDGGNytfRH$9%f%JHg&4bB_5>u2Q)fnHbd`0OAb$a>faRZWn_0
zo6OTQv$wBhp5EeKQ315Op6gVM->EV7esLZ5STKUkHqfFx3wh6v=A?}#hc7WVXX|B0
zEXsQvP-LF-ow)!PVY44|v*!5j;qR*}K&rzBd<*Jfv?sq$<FgmpuYh>wT08jV#?|bJ
zzvz`L03YTz7vi<E`sU-t(8gC?4bcP%RiynS)pa^~^fe5e73cyb{j)g0y>S$@_;Dr=
zaL{P1@S0PfXt@1@0y19UJ^s-+ooY{uklHJ<k6IbbZ*S)A2G>>)&%2myV+}f52^J{e
zeuCwWo)ofpp6L3PE<n=YyfwV!Tg8|#NY4_ip^p|~e1r{w^Ykt;<c_8kMzsD!*JEAX
z>1p(zc4|#0oN~j+b}Q9}ucCAzd&RvOR_is>vc|_O%TkZ^b@iubu-Asm|6Jv__^Ob$
M)vNS~+HEZV2Q!;?b^rhX

delta 711
zcmah{OKTHR7(L(2WSZ0(3u#a>VvMmn)3M+KR0vi>um+{Zf>6*gGi@TBBsfWoAVhE@
zDxwUCD}O>aaUmi_#Me?6uH1AXU8sw0+=ax`_IBMFzI)H(-ZOW;nJ2N8*t6Z8djRse
zT(NNV!=tZ2<Rf|F(v^wHYcf9pNSS=L<k|Iojp#J_FV<YC)kq?xJp}YDePhA)>w^Jw
z?r)HX7Z&f%XOHAA(7yp__sg#BtSz72OYbl1c$q?^-hT~rBuyb*_8RSxlfB0be@~uT
ztd(qi*;s$TIr4;Ox9gZefqtGmS+za4KmFnp5L)3Ht6uXPd(!(g9$=Kd1L4Rr*Jhj7
zcb)!+9R>y9%ToW%*4&HtewsmCCdCNya!@3=C1*}$5y5#K17Oblt{>*&^(bBpNU1qN
zoKW|M2lV1VcU77ad5h2JF*MtCbYHqZjHq;gD3-Q@&}0)fLj}XqR#<~6&lT1&E~^R~
z7}gFc9Kxt}Sz(j<9kyJI2+#1FwTT5|a#LXqBk}-xW@C|#i}F$#2FA3V3Wt!?G76j2
z?I1t&M-V(Un<s!N*r=k#(MJ(3M}FZcyV|n-qU#eEC_1R{tvnLfsWd$VGvNXgVngF>
i*>(xRtMGwiN&aQ-ZNE~hCN1k|#<DCb+wOc9{`Mc1Qigv3

diff --git a/tests/wpt/tests/graphics-aam/META.yml b/tests/wpt/tests/graphics-aam/META.yml
index 69446b204e7..197263836e7 100644
--- a/tests/wpt/tests/graphics-aam/META.yml
+++ b/tests/wpt/tests/graphics-aam/META.yml
@@ -1,4 +1,3 @@
 spec: https://w3c.github.io/graphics-aam/
 suggested_reviewers:
-  - halindrome
-  - joanmarie
+  - spectranaut
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 354abffb9cc..e5d12397a9a 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
@@ -1,6 +1,7 @@
 // META: script=/common/get-host-info.sub.js
 // META: script=/common/utils.js
 // META: script=/common/dispatcher/dispatcher.js
+// META: script=/fenced-frame/resources/utils.js
 // META: script=/html/cross-origin-embedder-policy/credentialless/resources/common.js
 // META: script=./resources/common.js
 // META: timeout=long
@@ -27,7 +28,7 @@ promise_test(async test => {
 
   // Create the the 3 actors.
   const iframe_credentialless_1 = newIframeCredentialless(cross_origin);
-  const fenced_frame = newFencedFrame(cross_origin);
+  const fenced_frame = await newFencedFrame(cross_origin);
   send(fenced_frame, `
     const importScript = ${importScript};
     await importScript("/common/utils.js");
diff --git a/tests/wpt/tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js b/tests/wpt/tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js
index a9cdcbbd560..c72341fc5c9 100644
--- a/tests/wpt/tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js
+++ b/tests/wpt/tests/html/anonymous-iframe/fenced-frame.tentative.https.window.js
@@ -23,10 +23,11 @@ promise_test(async test => {
   send(iframe_credentialless, `
     const importScript = ${importScript};
     await importScript("/common/utils.js");
+    await importScript("/fenced-frame/resources/utils.js");
     await importScript("/html/cross-origin-embedder-policy/credentialless" +
       "/resources/common.js");
     await importScript("/html/anonymous-iframe/resources/common.js");
-    const frame_fenced = newFencedFrame("${origin}");
+    const frame_fenced = await newFencedFrame("${origin}");
     send("${msg_queue}", frame_fenced);
   `);
   // TODO: Properly generate a fenced frame to check credentialless.
diff --git a/tests/wpt/tests/html/anonymous-iframe/resources/common.js b/tests/wpt/tests/html/anonymous-iframe/resources/common.js
index 241df1df242..2fa51aa9c61 100644
--- a/tests/wpt/tests/html/anonymous-iframe/resources/common.js
+++ b/tests/wpt/tests/html/anonymous-iframe/resources/common.js
@@ -33,16 +33,15 @@ const newPopup = (test, origin) => {
 
 // Create a fenced frame. The new document will execute any scripts sent
 // toward the token it returns.
-const newFencedFrame = (child_origin) => {
+const newFencedFrame = async (child_origin) => {
   const support_loading_mode_fenced_frame =
     "|header(Supports-Loading-Mode,fenced-frame)";
   const sub_document_token = token();
-  const fencedframe = document.createElement('fencedframe');
   const url = child_origin + executor_path +
     support_loading_mode_fenced_frame +
     `&uuid=${sub_document_token}`;
-  fencedframe.config = new FencedFrameConfig(url);
-  document.body.appendChild(fencedframe);
+  const urn = await generateURNFromFledge(url, []);
+  attachFencedFrame(urn);
   return sub_document_token;
 };
 
diff --git a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html
index a41fabf9686..05b1dbf4b71 100644
--- a/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html
+++ b/tests/wpt/tests/html/browsers/browsing-the-web/history-traversal/popstate_event.html
@@ -21,6 +21,7 @@ window.onload = t.step_func(function () {
     assert_true(e instanceof PopStateEvent, "is PopStateEvent");
     assert_false(e.bubbles, "bubbles");
     assert_false(e.cancelable, "cancelable");
+    assert_not_equals(e.hasUAVisualTransition, undefined);
 
     states.push(e.state);
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html
new file mode 100644
index 00000000000..88057fc354a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter-expected.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.global-filter</title>
+<h1>2d.layer.global-filter</h1>
+<p class="desc">Tests that layers ignore the global context filter.</p>
+<canvas id="canvas" width="150" height="100">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(60, 10, 30, 30);
+  ctx.filter = 'blur(5px)'
+  ctx.fillRect(10, 10, 30, 30);
+  ctx.fillRect(110, 10, 30, 30);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter.html
new file mode 100644
index 00000000000..cf46f41b974
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-filter.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.global-filter-expected.html">
+<title>Canvas test: 2d.layer.global-filter</title>
+<h1>2d.layer.global-filter</h1>
+<p class="desc">Tests that layers ignore the global context filter.</p>
+<canvas id="canvas" width="150" height="100">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.filter = 'blur(5px)'
+
+  ctx.beginLayer();
+  ctx.fillRect(10, 10, 30, 30);  // `ctx.filter` applied to draw call.
+  ctx.endLayer();
+
+  ctx.beginLayer();
+  ctx.filter = 'none';
+  ctx.fillRect(60, 10, 30, 30);  // Should not be filted by the layer.
+  ctx.endLayer();
+
+  ctx.fillRect(110, 10, 30, 30);  // `ctx.filter` is still set.
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html
index d7ba158d161..f7b633b35f6 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow-expected.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html
index 22946174cde..c8c6d433bc0 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.blending.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html
index a669a2271e9..0ae93871f52 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow-expected.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html
index c07e717a663..92b8a0d7a75 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.composite.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html
index 206eb750139..6f764c50017 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow-expected.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html
index bcb7fe50962..a325302b3b0 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.alpha.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html
index 02275c8cc21..6f969074f93 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow-expected.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html
index 80f414d4ee5..51926d76d8c 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.blending.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html
index e380cccab82..b687c27f471 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow-expected.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html
index 9e32dddd40d..c563a57b76e 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.composite.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html
index d9c93719b99..62942ffeaec 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html
@@ -47,6 +47,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html
index ae320702c2f..ccadfb624b7 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.blending.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html
index 26d13a4cae9..a6499725462 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html
@@ -47,6 +47,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html
index 050bb5f0e36..b2907f02aa5 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.composite.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html
index 9cc735fd42c..169baee29b9 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow-expected.html
@@ -46,6 +46,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html
index 97595444db7..6aa8e75a950 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.alpha.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html
index a48485f7e8a..91f3725f8ec 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow-expected.html
@@ -46,6 +46,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html
index 491bdb377b9..e54cf06d0dd 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.blending.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html
index 79191ee3910..4716bb2760f 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow-expected.html
@@ -46,6 +46,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html
index ce9215eeb1c..e5c76986347 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.composite.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html
index 59cf16fa87d..13ba2dd4cde 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow-expected.html
@@ -45,6 +45,7 @@
     ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html
index f7fc309cc0a..9efcd9d4f75 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.filter.shadow.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html
index ba56644d6c2..835e9d420ac 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow-expected.html
@@ -19,6 +19,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow.html
index bd9e868d1ef..209316164cb 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.global-states.shadow.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html
new file mode 100644
index 00000000000..9283fd39b7d
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.layer-rendering-state-reset-in-layer.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.layer-rendering-state-reset-in-layer</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.layer.layer-rendering-state-reset-in-layer</h1>
+<p class="desc">Tests that layers ignore the global context filter.</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("Tests that layers ignore the global context filter.");
+_addTest(function(canvas, ctx) {
+
+  ctx.globalAlpha = 0.5;
+  ctx.globalCompositeOperation = 'xor';
+  ctx.shadowColor = '#0000ff';
+  ctx.shadowOffsetX = 10;
+  ctx.shadowOffsetY = 20;
+  ctx.shadowBlur = 30;
+
+  _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5");
+  _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+  _assertSame(ctx.shadowColor, '#0000ff', "ctx.shadowColor", "'#0000ff'");
+  _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10");
+  _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20");
+  _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30");
+
+  ctx.beginLayer();
+
+  _assertSame(ctx.globalAlpha, 1.0, "ctx.globalAlpha", "1.0");
+  _assertSame(ctx.globalCompositeOperation, 'source-over', "ctx.globalCompositeOperation", "'source-over'");
+  _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'");
+  _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0");
+  _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
+  _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
+
+  ctx.endLayer();
+
+  _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5");
+  _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+  _assertSame(ctx.shadowColor, '#0000ff', "ctx.shadowColor", "'#0000ff'");
+  _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10");
+  _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20");
+  _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.reset.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.reset.html
index dc50ee76c10..9ad779abfdd 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.reset.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.reset.html
@@ -17,6 +17,7 @@
   ctx.shadowOffsetX = -3;
   ctx.shadowOffsetY = 3;
   ctx.shadowColor = 'rgba(0, 30, 0, 0.3)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: {name: 'dropShadow', dx: -3, dy: 3}});
 
@@ -26,6 +27,7 @@
   ctx.shadowOffsetX = -6;
   ctx.shadowOffsetY = 6;
   ctx.shadowColor = 'rgba(0, 60, 0, 0.6)';
+  ctx.shadowBlur = 3;
 
   ctx.reset();
 
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex-expected.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex-expected.html
index 84ad6244740..ef46f69e2a5 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex-expected.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex-expected.html
@@ -17,6 +17,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'orange';
+  ctx.shadowBlur = 3;
 
   var canvas2 = [5];
   var ctx2 = [5];
diff --git a/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex.html b/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex.html
index 6ae78f690ae..cff0c123ef6 100644
--- a/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex.html
+++ b/tests/wpt/tests/html/canvas/element/layers/2d.layer.several-complex.html
@@ -19,7 +19,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'orange';
-
+  ctx.shadowBlur = 3
 
   for (let i = 0; i < 5; i++) {
     ctx.beginLayer();
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip-expected.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip-expected.html
new file mode 100644
index 00000000000..974b37fab4e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip-expected.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.clip</title>
+<h1>2d.reset.state.clip</h1>
+<p class="desc">check that the clip is reset</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(0, 0, 200, 200);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip.html
new file mode 100644
index 00000000000..ab3fa1081ca
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.clip.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.state.clip-expected.html">
+<title>Canvas test: 2d.reset.state.clip</title>
+<h1>2d.reset.state.clip</h1>
+<p class="desc">check that the clip is reset</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.beginPath();
+  ctx.rect(0, 0, 100, 100);
+  ctx.clip();
+
+  ctx.fillRect(0, 0, 200, 200);
+
+  ctx.reset();
+
+  ctx.fillRect(0, 0, 200, 200);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.direction.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.direction.html
new file mode 100644
index 00000000000..8b27e3cfe44
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.direction.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.direction</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.reset.state.direction</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.direction;
+
+  ctx.direction = 'rtl';
+  _assert(ctx.direction == 'rtl', "ctx.direction == 'rtl'");
+
+  ctx.reset();
+  _assert(ctx.direction == default_value, "ctx.direction == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.fill_style.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.fill_style.html
new file mode 100644
index 00000000000..1239e2ec7fb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.fill_style.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.fill_style</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.reset.state.fill_style</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.fillStyle;
+
+  ctx.fillStyle = '#ffffff';
+  _assert(ctx.fillStyle == '#ffffff', "ctx.fillStyle == '#ffffff'");
+
+  ctx.reset();
+  _assert(ctx.fillStyle == default_value, "ctx.fillStyle == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.filter.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.filter.html
new file mode 100644
index 00000000000..80ccd22bb2b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.filter.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.filter</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.reset.state.filter</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.filter;
+
+  ctx.filter = 'blur(10px)';
+  _assert(ctx.filter == 'blur(10px)', "ctx.filter == 'blur(10px)'");
+
+  ctx.reset();
+  _assert(ctx.filter == default_value, "ctx.filter == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font.html
new file mode 100644
index 00000000000..c93d038a622
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.font</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.reset.state.font</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.font;
+
+  ctx.font = '16px sans-serif';
+  _assert(ctx.font == '16px sans-serif', "ctx.font == '16px sans-serif'");
+
+  ctx.reset();
+  _assert(ctx.font == default_value, "ctx.font == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_kerning.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_kerning.html
new file mode 100644
index 00000000000..d3ad9d386cb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_kerning.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.font_kerning</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.reset.state.font_kerning</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.fontKerning;
+
+  ctx.fontKerning = 'normal';
+  _assert(ctx.fontKerning == 'normal', "ctx.fontKerning == 'normal'");
+
+  ctx.reset();
+  _assert(ctx.fontKerning == default_value, "ctx.fontKerning == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_stretch.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_stretch.html
new file mode 100644
index 00000000000..0a91c640b26
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_stretch.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.font_stretch</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.reset.state.font_stretch</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.fontStretch;
+
+  ctx.fontStretch = 'ultra-condensed';
+  _assert(ctx.fontStretch == 'ultra-condensed', "ctx.fontStretch == 'ultra-condensed'");
+
+  ctx.reset();
+  _assert(ctx.fontStretch == default_value, "ctx.fontStretch == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_variant_caps.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_variant_caps.html
new file mode 100644
index 00000000000..262c4fc4d3a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.font_variant_caps.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.font_variant_caps</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.reset.state.font_variant_caps</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.fontVariantCaps;
+
+  ctx.fontVariantCaps = 'unicase';
+  _assert(ctx.fontVariantCaps == 'unicase', "ctx.fontVariantCaps == 'unicase'");
+
+  ctx.reset();
+  _assert(ctx.fontVariantCaps == default_value, "ctx.fontVariantCaps == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_alpha.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_alpha.html
new file mode 100644
index 00000000000..18b825e60fd
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_alpha.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.global_alpha</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.reset.state.global_alpha</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.globalAlpha;
+
+  ctx.globalAlpha = 0.5;
+  _assert(ctx.globalAlpha == 0.5, "ctx.globalAlpha == 0.5");
+
+  ctx.reset();
+  _assert(ctx.globalAlpha == default_value, "ctx.globalAlpha == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_composite_operation.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_composite_operation.html
new file mode 100644
index 00000000000..aee6841d955
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.global_composite_operation.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.global_composite_operation</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.reset.state.global_composite_operation</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.globalCompositeOperation;
+
+  ctx.globalCompositeOperation = 'destination-over';
+  _assert(ctx.globalCompositeOperation == 'destination-over', "ctx.globalCompositeOperation == 'destination-over'");
+
+  ctx.reset();
+  _assert(ctx.globalCompositeOperation == default_value, "ctx.globalCompositeOperation == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html
new file mode 100644
index 00000000000..e865967a38f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_enabled.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.image_smoothing_enabled</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.reset.state.image_smoothing_enabled</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.imageSmoothingEnabled;
+
+  ctx.imageSmoothingEnabled = false;
+  _assert(ctx.imageSmoothingEnabled == false, "ctx.imageSmoothingEnabled == false");
+
+  ctx.reset();
+  _assert(ctx.imageSmoothingEnabled == default_value, "ctx.imageSmoothingEnabled == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html
new file mode 100644
index 00000000000..e78abfce77e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.image_smoothing_quality.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.image_smoothing_quality</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.reset.state.image_smoothing_quality</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.imageSmoothingQuality;
+
+  ctx.imageSmoothingQuality = 'high';
+  _assert(ctx.imageSmoothingQuality == 'high', "ctx.imageSmoothingQuality == 'high'");
+
+  ctx.reset();
+  _assert(ctx.imageSmoothingQuality == default_value, "ctx.imageSmoothingQuality == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.letter_spacing.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.letter_spacing.html
new file mode 100644
index 00000000000..3e732b1fa05
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.letter_spacing.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.letter_spacing</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.reset.state.letter_spacing</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.letterSpacing;
+
+  ctx.letterSpacing = '12px';
+  _assert(ctx.letterSpacing == '12px', "ctx.letterSpacing == '12px'");
+
+  ctx.reset();
+  _assert(ctx.letterSpacing == default_value, "ctx.letterSpacing == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_cap.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_cap.html
new file mode 100644
index 00000000000..8020e284a74
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_cap.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.line_cap</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.reset.state.line_cap</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.lineCap;
+
+  ctx.lineCap = 'square';
+  _assert(ctx.lineCap == 'square', "ctx.lineCap == 'square'");
+
+  ctx.reset();
+  _assert(ctx.lineCap == default_value, "ctx.lineCap == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash.html
new file mode 100644
index 00000000000..ca68ae51588
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.line_dash</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.reset.state.line_dash</h1>
+<p class="desc">check that the line dash is reset</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("check that the line dash is reset");
+_addTest(function(canvas, ctx) {
+
+  ctx.setLineDash([1, 2]);
+
+  ctx.reset();
+  _assert(ctx.getLineDash().length == 0, "ctx.getLineDash().length == 0");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash_offset.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash_offset.html
new file mode 100644
index 00000000000..10015199b93
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_dash_offset.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.line_dash_offset</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.reset.state.line_dash_offset</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.lineDashOffset;
+
+  ctx.lineDashOffset = 1.0;
+  _assert(ctx.lineDashOffset == 1.0, "ctx.lineDashOffset == 1.0");
+
+  ctx.reset();
+  _assert(ctx.lineDashOffset == default_value, "ctx.lineDashOffset == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_join.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_join.html
new file mode 100644
index 00000000000..1c20cb1b2ae
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_join.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.line_join</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.reset.state.line_join</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.lineJoin;
+
+  ctx.lineJoin = 'bevel';
+  _assert(ctx.lineJoin == 'bevel', "ctx.lineJoin == 'bevel'");
+
+  ctx.reset();
+  _assert(ctx.lineJoin == default_value, "ctx.lineJoin == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_width.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_width.html
new file mode 100644
index 00000000000..db2516b5350
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.line_width.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.line_width</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.reset.state.line_width</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.lineWidth;
+
+  ctx.lineWidth = 1;
+  _assert(ctx.lineWidth == 1, "ctx.lineWidth == 1");
+
+  ctx.reset();
+  _assert(ctx.lineWidth == default_value, "ctx.lineWidth == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.miter_limit.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.miter_limit.html
new file mode 100644
index 00000000000..7920c38d52c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.miter_limit.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.miter_limit</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.reset.state.miter_limit</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.miterLimit;
+
+  ctx.miterLimit = 1.0;
+  _assert(ctx.miterLimit == 1.0, "ctx.miterLimit == 1.0");
+
+  ctx.reset();
+  _assert(ctx.miterLimit == default_value, "ctx.miterLimit == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_blur.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_blur.html
new file mode 100644
index 00000000000..07784de7d55
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_blur.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.shadow_blur</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.reset.state.shadow_blur</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.shadowBlur;
+
+  ctx.shadowBlur = 10.0;
+  _assert(ctx.shadowBlur == 10.0, "ctx.shadowBlur == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowBlur == default_value, "ctx.shadowBlur == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_color.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_color.html
new file mode 100644
index 00000000000..9e8ee6c7f5a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_color.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.shadow_color</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.reset.state.shadow_color</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.shadowColor;
+
+  ctx.shadowColor = '#ff0000';
+  _assert(ctx.shadowColor == '#ff0000', "ctx.shadowColor == '#ff0000'");
+
+  ctx.reset();
+  _assert(ctx.shadowColor == default_value, "ctx.shadowColor == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html
new file mode 100644
index 00000000000..7992ce4c1e7
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_x.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.shadow_offset_x</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.reset.state.shadow_offset_x</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.shadowOffsetX;
+
+  ctx.shadowOffsetX = 10.0;
+  _assert(ctx.shadowOffsetX == 10.0, "ctx.shadowOffsetX == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowOffsetX == default_value, "ctx.shadowOffsetX == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html
new file mode 100644
index 00000000000..84a38e0bdbb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.shadow_offset_y.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.shadow_offset_y</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.reset.state.shadow_offset_y</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.shadowOffsetY;
+
+  ctx.shadowOffsetY = 10.0;
+  _assert(ctx.shadowOffsetY == 10.0, "ctx.shadowOffsetY == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowOffsetY == default_value, "ctx.shadowOffsetY == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.stroke_style.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.stroke_style.html
new file mode 100644
index 00000000000..4acb19c41eb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.stroke_style.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.stroke_style</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.reset.state.stroke_style</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.strokeStyle;
+
+  ctx.strokeStyle = '#ffffff';
+  _assert(ctx.strokeStyle == '#ffffff', "ctx.strokeStyle == '#ffffff'");
+
+  ctx.reset();
+  _assert(ctx.strokeStyle == default_value, "ctx.strokeStyle == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_align.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_align.html
new file mode 100644
index 00000000000..a625737d722
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_align.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.text_align</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.reset.state.text_align</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.textAlign;
+
+  ctx.textAlign = 'end';
+  _assert(ctx.textAlign == 'end', "ctx.textAlign == 'end'");
+
+  ctx.reset();
+  _assert(ctx.textAlign == default_value, "ctx.textAlign == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_baseline.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_baseline.html
new file mode 100644
index 00000000000..2e4169bdb1e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_baseline.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.text_baseline</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.reset.state.text_baseline</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.textBaseline;
+
+  ctx.textBaseline = 'middle';
+  _assert(ctx.textBaseline == 'middle', "ctx.textBaseline == 'middle'");
+
+  ctx.reset();
+  _assert(ctx.textBaseline == default_value, "ctx.textBaseline == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_rendering.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_rendering.html
new file mode 100644
index 00000000000..e182babee4d
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.text_rendering.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.text_rendering</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.reset.state.text_rendering</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.textRendering;
+
+  ctx.textRendering = 'geometricPrecision';
+  _assert(ctx.textRendering == 'geometricPrecision', "ctx.textRendering == 'geometricPrecision'");
+
+  ctx.reset();
+  _assert(ctx.textRendering == default_value, "ctx.textRendering == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.transformation_matrix.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.transformation_matrix.html
new file mode 100644
index 00000000000..7872681bfc4
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.transformation_matrix.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.transformation_matrix</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.reset.state.transformation_matrix</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  ctx.scale(2, 2);
+
+  ctx.reset();
+  _assert(ctx.getTransform().isIdentity, "ctx.getTransform().isIdentity");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.word_spacing.html b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.word_spacing.html
new file mode 100644
index 00000000000..c4a448f21c4
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/reset/2d.reset.state.word_spacing.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.word_spacing</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.reset.state.word_spacing</h1>
+<p class="desc">check that the state is reset</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("check that the state is reset");
+_addTest(function(canvas, ctx) {
+
+  const default_value = ctx.wordSpacing;
+
+  ctx.wordSpacing = '12px';
+  _assert(ctx.wordSpacing == '12px', "ctx.wordSpacing == '12px'");
+
+  ctx.reset();
+  _assert(ctx.wordSpacing == default_value, "ctx.wordSpacing == default_value");
+
+});
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/reference/fontVariantCaps-1-ref.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html
similarity index 100%
rename from tests/wpt/tests/html/canvas/element/text/reference/fontVariantCaps-1-ref.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1-expected.html
diff --git a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-1.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html
similarity index 90%
rename from tests/wpt/tests/html/canvas/element/text/fontVariantCaps-1.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html
index 3240476ad0f..b610c2240ff 100644
--- a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-1.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps1.html
@@ -3,7 +3,7 @@
 <title>HTML Canvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-1-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps1-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="c"></canvas>
diff --git a/tests/wpt/tests/html/canvas/element/text/reference/fontVariantCaps-2-ref.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html
similarity index 100%
rename from tests/wpt/tests/html/canvas/element/text/reference/fontVariantCaps-2-ref.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2-unexpected.html
diff --git a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-2.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html
similarity index 89%
rename from tests/wpt/tests/html/canvas/element/text/fontVariantCaps-2.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html
index cbcb73b231c..f9d42ac3a60 100644
--- a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-2.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps2.html
@@ -3,7 +3,7 @@
 <title>HTML Canvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="mismatch" href="reference/fontVariantCaps-2-ref.html">
+<link rel="mismatch" href="2d.text.fontVariantCaps2-unexpected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="c"></canvas>
diff --git a/tests/wpt/tests/html/canvas/element/text/reference/fontVariantCaps-3-ref.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html
similarity index 100%
rename from tests/wpt/tests/html/canvas/element/text/reference/fontVariantCaps-3-ref.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3-expected.html
diff --git a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-3.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html
similarity index 91%
rename from tests/wpt/tests/html/canvas/element/text/fontVariantCaps-3.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html
index 8c0761121ef..a90e0c29b3d 100644
--- a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-3.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps3.html
@@ -3,7 +3,7 @@
 <title>HTML Canvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-3-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps3-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="c"></canvas>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html
new file mode 100644
index 00000000000..069fbfba882
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4-expected.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+ctx.fillText("hello world", 20, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-4.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html
similarity index 91%
rename from tests/wpt/tests/html/canvas/element/text/fontVariantCaps-4.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html
index 62fe241838b..b598fb60baf 100644
--- a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-4.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps4.html
@@ -3,7 +3,7 @@
 <title>HTML Canvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-3-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps4-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="c"></canvas>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html
new file mode 100644
index 00000000000..8ea3c22be13
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5-expected.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "small-caps 32px serif";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-5.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html
similarity index 91%
rename from tests/wpt/tests/html/canvas/element/text/fontVariantCaps-5.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html
index a21169f8bb6..b871f7c0624 100644
--- a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-5.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps5.html
@@ -3,7 +3,7 @@
 <title>HTML Canvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-1-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps5-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="c"></canvas>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html
new file mode 100644
index 00000000000..c64f5d0ec2a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6-expected.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML Canvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c"></canvas>
+
+<script>
+let ctx = c.getContext("2d");
+ctx.font = "32px serif";
+ctx.fillText("Hello World", 20, 100);
+</script>
diff --git a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-6.html b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html
similarity index 91%
rename from tests/wpt/tests/html/canvas/element/text/fontVariantCaps-6.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html
index 6126c4e7b2f..e7bbd29341d 100644
--- a/tests/wpt/tests/html/canvas/element/text/fontVariantCaps-6.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.fontVariantCaps6.html
@@ -3,7 +3,7 @@
 <title>HTML Canvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-2-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps6-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="c"></canvas>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html
new file mode 100644
index 00000000000..7b6874d10b5
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-low-ascent.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.measure.emHeights-low-ascent</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: CanvasTest-ascent256;
+  src: url("/fonts/CanvasTest-ascent256.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.emHeights-low-ascent</h1>
+<p class="desc">Testing emHeights with reduced ascent metric</p>
+
+
+<span style="font-family: CanvasTest-ascent256; 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 = '40px CanvasTest-ascent256';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').emHeightAscent, 20, "ctx.measureText('A').emHeightAscent", "20");
+  _assertSame(ctx.measureText('A').emHeightDescent, 20, "ctx.measureText('A').emHeightDescent", "20");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
+
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 20, "ctx.measureText('ABCD').emHeightAscent", "20");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 20, "ctx.measureText('ABCD').emHeightDescent", "20");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
+
+}, "Testing emHeights with reduced ascent metric");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html
new file mode 100644
index 00000000000..c3ce994fa14
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights-zero-descent.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.measure.emHeights-zero-descent</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: CanvasTest-descent0;
+  src: url("/fonts/CanvasTest-descent0.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.emHeights-zero-descent</h1>
+<p class="desc">Testing emHeights with zero descent metric</p>
+
+
+<span style="font-family: CanvasTest-descent0; 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 = '40px CanvasTest-descent0';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightAscent", "40");
+  _assertSame(ctx.measureText('A').emHeightDescent, 0, "ctx.measureText('A').emHeightDescent", "0");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
+
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightAscent", "40");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 0, "ctx.measureText('ABCD').emHeightDescent", "0");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
+
+}, "Testing emHeights with zero descent metric");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights.html
index e39fc06c411..0db4c30801f 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.emHeights.html
@@ -29,16 +29,16 @@ promise_test(async t => {
   var ctx = canvas.getContext('2d');
 
   await document.fonts.ready;
-  ctx.font = '50px CanvasTest';
+  ctx.font = '40px CanvasTest';
   ctx.direction = 'ltr';
   ctx.align = 'left'
-  _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
-  _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
-  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
+  _assertSame(ctx.measureText('A').emHeightAscent, 30, "ctx.measureText('A').emHeightAscent", "30");
+  _assertSame(ctx.measureText('A').emHeightDescent, 10, "ctx.measureText('A').emHeightDescent", "10");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
 
-  _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
-  _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
-  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 30, "ctx.measureText('ABCD').emHeightAscent", "30");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 10, "ctx.measureText('ABCD').emHeightDescent", "10");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
 
 }, "Testing emHeights");
 </script>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html
new file mode 100644
index 00000000000..653d26d820e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-reduced-ascent.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.measure.fontBoundingBox-reduced-ascent</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: CanvasTest-ascent256;
+  src: url("/fonts/CanvasTest-ascent256.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.fontBoundingBox-reduced-ascent</h1>
+<p class="desc">Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric</p>
+
+
+<span style="font-family: CanvasTest-ascent256; 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 = '40px CanvasTest-ascent256';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 10, "ctx.measureText('A').fontBoundingBoxAscent", "10");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 10, "ctx.measureText('A').fontBoundingBoxDescent", "10");
+
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 10, "ctx.measureText('ABCD').fontBoundingBoxAscent", "10");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 10, "ctx.measureText('ABCD').fontBoundingBoxDescent", "10");
+
+}, "Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html
new file mode 100644
index 00000000000..785c0bc1866
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox-zero-descent.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.text.measure.fontBoundingBox-zero-descent</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: CanvasTest-descent0;
+  src: url("/fonts/CanvasTest-descent0.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.fontBoundingBox-zero-descent</h1>
+<p class="desc">Testing fontBoundingBox for OffscreenCanvas with zero descent metric</p>
+
+
+<span style="font-family: CanvasTest-descent0; 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 = '40px CanvasTest-descent0';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 30, "ctx.measureText('A').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 0, "ctx.measureText('A').fontBoundingBoxDescent", "0");
+
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 30, "ctx.measureText('ABCD').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 0, "ctx.measureText('ABCD').fontBoundingBoxDescent", "0");
+
+}, "Testing fontBoundingBox for OffscreenCanvas with zero descent metric");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox.html
index 375910593aa..9e7e190754d 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.fontBoundingBox.html
@@ -29,15 +29,14 @@ promise_test(async t => {
   var ctx = canvas.getContext('2d');
 
   await document.fonts.ready;
-  ctx.font = '50px CanvasTest';
+  ctx.font = '40px CanvasTest';
   ctx.direction = 'ltr';
   ctx.align = 'left'
-  // approx_equals because font metrics may be rounded slightly differently by different platforms/browsers.
-  assert_approx_equals(ctx.measureText('A').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-  assert_approx_equals(ctx.measureText('A').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 30, "ctx.measureText('A').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 10, "ctx.measureText('A').fontBoundingBoxDescent", "10");
 
-  assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-  assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 30, "ctx.measureText('ABCD').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 10, "ctx.measureText('ABCD').fontBoundingBoxDescent", "10");
 
 }, "Testing fontBoundingBox measurements");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html
new file mode 100644
index 00000000000..88057fc354a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter-expected.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.layer.global-filter</title>
+<h1>2d.layer.global-filter</h1>
+<p class="desc">Tests that layers ignore the global context filter.</p>
+<canvas id="canvas" width="150" height="100">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(60, 10, 30, 30);
+  ctx.filter = 'blur(5px)'
+  ctx.fillRect(10, 10, 30, 30);
+  ctx.fillRect(110, 10, 30, 30);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html
new file mode 100644
index 00000000000..2388a06a964
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.layer.global-filter-expected.html">
+<title>Canvas test: 2d.layer.global-filter</title>
+<h1>2d.layer.global-filter</h1>
+<p class="desc">Tests that layers ignore the global context filter.</p>
+<canvas id="canvas" width="150" height="100">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(150, 100);
+  const ctx = canvas.getContext('2d');
+
+  ctx.filter = 'blur(5px)'
+
+  ctx.beginLayer();
+  ctx.fillRect(10, 10, 30, 30);  // `ctx.filter` applied to draw call.
+  ctx.endLayer();
+
+  ctx.beginLayer();
+  ctx.filter = 'none';
+  ctx.fillRect(60, 10, 30, 30);  // Should not be filted by the layer.
+  ctx.endLayer();
+
+  ctx.fillRect(110, 10, 30, 30);  // `ctx.filter` is still set.
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html
new file mode 100644
index 00000000000..4c8f92d18a1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-filter.w.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.layer.global-filter-expected.html">
+<title>Canvas test: 2d.layer.global-filter</title>
+<h1>2d.layer.global-filter</h1>
+<p class="desc">Tests that layers ignore the global context filter.</p>
+<canvas id="canvas" width="150" height="100">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(150, 100);
+    const ctx = canvas.getContext('2d');
+
+    ctx.filter = 'blur(5px)'
+
+    ctx.beginLayer();
+    ctx.fillRect(10, 10, 30, 30);  // `ctx.filter` applied to draw call.
+    ctx.endLayer();
+
+    ctx.beginLayer();
+    ctx.filter = 'none';
+    ctx.fillRect(60, 10, 30, 30);  // Should not be filted by the layer.
+    ctx.endLayer();
+
+    ctx.fillRect(110, 10, 30, 30);  // `ctx.filter` is still set.
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html
index d7ba158d161..f7b633b35f6 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow-expected.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html
index 551df36b15e..ed2d2d70af2 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html
index 6851a4a8468..1ff3ad83850 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.blending.shadow.w.html
@@ -24,6 +24,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html
index a669a2271e9..0ae93871f52 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow-expected.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html
index 841742ef1e7..eb579cdcce7 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html
index ef44257c0ad..60e36f4b978 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.composite.shadow.w.html
@@ -24,6 +24,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html
index 206eb750139..6f764c50017 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow-expected.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html
index daa788cd150..65a66c977d5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html
index f75db3d2490..f404601e3d1 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.alpha.shadow.w.html
@@ -23,6 +23,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html
index 02275c8cc21..6f969074f93 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow-expected.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html
index 9ad87aa0cd2..2e91f3d2d10 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html
index dc52e9e9251..d8e20d04795 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.blending.shadow.w.html
@@ -23,6 +23,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html
index e380cccab82..b687c27f471 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow-expected.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html
index 2e0883f5af8..1e3ab4d6a07 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html
index 66d44050581..7dfb70148b5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.composite.shadow.w.html
@@ -23,6 +23,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html
index d9c93719b99..62942ffeaec 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow-expected.html
@@ -47,6 +47,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html
index fd6022c85d2..62d98d967c8 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html
index 00237ef3fb1..e81efd6b8de 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.blending.shadow.w.html
@@ -24,6 +24,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: [
         {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html
index 26d13a4cae9..a6499725462 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow-expected.html
@@ -47,6 +47,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html
index 069e5ccf986..d067ff2f5e4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.html
@@ -22,6 +22,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html
index f5829242815..39abc78b17d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.composite.shadow.w.html
@@ -24,6 +24,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: [
         {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html
index 9cc735fd42c..169baee29b9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow-expected.html
@@ -46,6 +46,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html
index aaa2e1cfb1e..2548c211810 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html
index ff211ec7beb..5e1494422ee 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.alpha.shadow.w.html
@@ -23,6 +23,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: [
         {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html
index a48485f7e8a..91f3725f8ec 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow-expected.html
@@ -46,6 +46,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html
index 57fbca6d3b7..d0d429bee33 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html
index 674c177bc8f..ce432ea74d9 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.blending.shadow.w.html
@@ -23,6 +23,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: [
         {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html
index 79191ee3910..4716bb2760f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow-expected.html
@@ -46,6 +46,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html
index 0cc84d92cbd..b5e8b9f843a 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.html
@@ -21,6 +21,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html
index cddcc3cdd7d..894089d88e4 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.composite.shadow.w.html
@@ -23,6 +23,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: [
         {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html
index 59cf16fa87d..13ba2dd4cde 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow-expected.html
@@ -45,6 +45,7 @@
     ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
     ctx.drawImage(img, 0, 0);
   };
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html
index 5780181a3f2..7bb0ef5e134 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: [
       {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html
index 99ea29b5dc5..bc9bd48aad3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.filter.shadow.w.html
@@ -22,6 +22,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: [
         {name: 'colorMatrix', values: [0.393, 0.769, 0.189, 0, 0,
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html
index ba56644d6c2..835e9d420ac 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow-expected.html
@@ -19,6 +19,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   canvas2 = document.createElement("canvas");
   ctx2 = canvas2.getContext("2d");
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html
index 41a832c516e..ad60e87fb13 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.html
@@ -20,6 +20,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html
index 7b78f4b739a..1fc35fd33aa 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.global-states.shadow.w.html
@@ -22,6 +22,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html
new file mode 100644
index 00000000000..867553b45e0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.layer.layer-rendering-state-reset-in-layer</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.layer.layer-rendering-state-reset-in-layer</h1>
+<p class="desc">Tests that layers ignore the global context filter.</p>
+
+
+<script>
+var t = async_test("Tests that layers ignore the global context filter.");
+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');
+
+  ctx.globalAlpha = 0.5;
+  ctx.globalCompositeOperation = 'xor';
+  ctx.shadowColor = '#0000ff';
+  ctx.shadowOffsetX = 10;
+  ctx.shadowOffsetY = 20;
+  ctx.shadowBlur = 30;
+
+  _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5");
+  _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+  _assertSame(ctx.shadowColor, '#0000ff', "ctx.shadowColor", "'#0000ff'");
+  _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10");
+  _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20");
+  _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30");
+
+  ctx.beginLayer();
+
+  _assertSame(ctx.globalAlpha, 1.0, "ctx.globalAlpha", "1.0");
+  _assertSame(ctx.globalCompositeOperation, 'source-over', "ctx.globalCompositeOperation", "'source-over'");
+  _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'");
+  _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0");
+  _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
+  _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
+
+  ctx.endLayer();
+
+  _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5");
+  _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+  _assertSame(ctx.shadowColor, '#0000ff', "ctx.shadowColor", "'#0000ff'");
+  _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10");
+  _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20");
+  _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js
new file mode 100644
index 00000000000..5c2bb73e8f8
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.layer-rendering-state-reset-in-layer.worker.js
@@ -0,0 +1,52 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.layer.layer-rendering-state-reset-in-layer
+// Description:Tests that layers ignore the global context filter.
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("Tests that layers ignore the global context filter.");
+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');
+
+  ctx.globalAlpha = 0.5;
+  ctx.globalCompositeOperation = 'xor';
+  ctx.shadowColor = '#0000ff';
+  ctx.shadowOffsetX = 10;
+  ctx.shadowOffsetY = 20;
+  ctx.shadowBlur = 30;
+
+  _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5");
+  _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+  _assertSame(ctx.shadowColor, '#0000ff', "ctx.shadowColor", "'#0000ff'");
+  _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10");
+  _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20");
+  _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30");
+
+  ctx.beginLayer();
+
+  _assertSame(ctx.globalAlpha, 1.0, "ctx.globalAlpha", "1.0");
+  _assertSame(ctx.globalCompositeOperation, 'source-over', "ctx.globalCompositeOperation", "'source-over'");
+  _assertSame(ctx.shadowColor, 'rgba(0, 0, 0, 0)', "ctx.shadowColor", "'rgba(0, 0, 0, 0)'");
+  _assertSame(ctx.shadowOffsetX, 0, "ctx.shadowOffsetX", "0");
+  _assertSame(ctx.shadowOffsetY, 0, "ctx.shadowOffsetY", "0");
+  _assertSame(ctx.shadowBlur, 0, "ctx.shadowBlur", "0");
+
+  ctx.endLayer();
+
+  _assertSame(ctx.globalAlpha, 0.5, "ctx.globalAlpha", "0.5");
+  _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+  _assertSame(ctx.shadowColor, '#0000ff', "ctx.shadowColor", "'#0000ff'");
+  _assertSame(ctx.shadowOffsetX, 10, "ctx.shadowOffsetX", "10");
+  _assertSame(ctx.shadowOffsetY, 20, "ctx.shadowOffsetY", "20");
+  _assertSame(ctx.shadowBlur, 30, "ctx.shadowBlur", "30");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.html
index 4b2fe6229fe..3254c0a0489 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.html
@@ -17,6 +17,7 @@
   ctx.shadowOffsetX = -3;
   ctx.shadowOffsetY = 3;
   ctx.shadowColor = 'rgba(0, 30, 0, 0.3)';
+  ctx.shadowBlur = 3;
 
   ctx.beginLayer({filter: {name: 'dropShadow', dx: -3, dy: 3}});
 
@@ -26,6 +27,7 @@
   ctx.shadowOffsetX = -6;
   ctx.shadowOffsetY = 6;
   ctx.shadowColor = 'rgba(0, 60, 0, 0.6)';
+  ctx.shadowBlur = 3;
 
   ctx.reset();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.w.html
index 710e56bf46b..09bd6451bd0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.reset.w.html
@@ -19,6 +19,7 @@
     ctx.shadowOffsetX = -3;
     ctx.shadowOffsetY = 3;
     ctx.shadowColor = 'rgba(0, 30, 0, 0.3)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: {name: 'dropShadow', dx: -3, dy: 3}});
 
@@ -28,6 +29,7 @@
     ctx.shadowOffsetX = -6;
     ctx.shadowOffsetY = 6;
     ctx.shadowColor = 'rgba(0, 60, 0, 0.6)';
+    ctx.shadowBlur = 3;
 
     ctx.reset();
 
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html
index 84ad6244740..ef46f69e2a5 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex-expected.html
@@ -17,6 +17,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'orange';
+  ctx.shadowBlur = 3;
 
   var canvas2 = [5];
   var ctx2 = [5];
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.html
index c4b50282805..e30f1d2fa0e 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.html
@@ -19,7 +19,7 @@
   ctx.shadowOffsetX = -10;
   ctx.shadowOffsetY = 10;
   ctx.shadowColor = 'orange';
-
+  ctx.shadowBlur = 3
 
   for (let i = 0; i < 5; i++) {
     ctx.beginLayer();
diff --git a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html
index 114c5e06868..e00de635072 100644
--- a/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html
+++ b/tests/wpt/tests/html/canvas/offscreen/layers/2d.layer.several-complex.w.html
@@ -21,7 +21,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'orange';
-
+    ctx.shadowBlur = 3
 
     for (let i = 0; i < 5; i++) {
       ctx.beginLayer();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.html
new file mode 100644
index 00000000000..7396ca120a3
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.basic</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.basic</h1>
+<p class="desc">reset clears to transparent black</p>
+
+
+<script>
+var t = async_test("reset clears to transparent black");
+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');
+
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+  ctx.reset();
+  _assertPixel(canvas, 0,0, 0,0,0,0);
+  _assertPixel(canvas, 50,25, 0,0,0,0);
+  _assertPixel(canvas, 25,50, 0,0,0,0);
+  _assertPixel(canvas, 100,50, 0,0,0,0);
+  _assertPixel(canvas, 0,50, 0,0,0,0);
+  _assertPixel(canvas, 100,0, 0,0,0,0);
+  t.done();
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.worker.js
new file mode 100644
index 00000000000..180bffbfac3
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.basic.worker.js
@@ -0,0 +1,31 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.basic
+// Description:reset clears to transparent black
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("reset clears to transparent black");
+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');
+
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+  ctx.reset();
+  _assertPixel(canvas, 0,0, 0,0,0,0);
+  _assertPixel(canvas, 50,25, 0,0,0,0);
+  _assertPixel(canvas, 25,50, 0,0,0,0);
+  _assertPixel(canvas, 100,50, 0,0,0,0);
+  _assertPixel(canvas, 0,50, 0,0,0,0);
+  _assertPixel(canvas, 100,0, 0,0,0,0);
+  t.done();
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip-expected.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip-expected.html
new file mode 100644
index 00000000000..974b37fab4e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip-expected.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.reset.state.clip</title>
+<h1>2d.reset.state.clip</h1>
+<p class="desc">check that the clip is reset</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext('2d');
+
+  ctx.fillRect(0, 0, 200, 200);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.html
new file mode 100644
index 00000000000..2f53da7a496
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<link rel="match" href="2d.reset.state.clip-expected.html">
+<title>Canvas test: 2d.reset.state.clip</title>
+<h1>2d.reset.state.clip</h1>
+<p class="desc">check that the clip is reset</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script>
+  const canvas = new OffscreenCanvas(200, 200);
+  const ctx = canvas.getContext('2d');
+
+  ctx.beginPath();
+  ctx.rect(0, 0, 100, 100);
+  ctx.clip();
+
+  ctx.fillRect(0, 0, 200, 200);
+
+  ctx.reset();
+
+  ctx.fillRect(0, 0, 200, 200);
+
+  const outputCanvas = document.getElementById("canvas");
+  outputCanvas.getContext('2d').drawImage(canvas, 0, 0);
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.w.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.w.html
new file mode 100644
index 00000000000..ec4bdf5b23f
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.clip.w.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<html class="reftest-wait">
+<link rel="match" href="2d.reset.state.clip-expected.html">
+<title>Canvas test: 2d.reset.state.clip</title>
+<h1>2d.reset.state.clip</h1>
+<p class="desc">check that the clip is reset</p>
+<canvas id="canvas" width="200" height="200">
+  <p class="fallback">FAIL (fallback content)</p>
+</canvas>
+<script id='myWorker' type='text/worker'>
+  self.onmessage = function(e) {
+    const canvas = new OffscreenCanvas(200, 200);
+    const ctx = canvas.getContext('2d');
+
+    ctx.beginPath();
+    ctx.rect(0, 0, 100, 100);
+    ctx.clip();
+
+    ctx.fillRect(0, 0, 200, 200);
+
+    ctx.reset();
+
+    ctx.fillRect(0, 0, 200, 200);
+
+    const bitmap = canvas.transferToImageBitmap();
+    self.postMessage(bitmap, bitmap);
+  };
+</script>
+<script>
+  const blob = new Blob([document.getElementById('myWorker').textContent]);
+  const worker = new Worker(URL.createObjectURL(blob));
+  worker.addEventListener('message', msg => {
+    const outputCtx = document.getElementById("canvas").getContext('2d');
+    outputCtx.drawImage(msg.data, 0, 0);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  worker.postMessage(null);
+</script>
+</html>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.html
new file mode 100644
index 00000000000..f2dc299e971
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.direction</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.direction</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.direction;
+
+  ctx.direction = 'rtl';
+  _assert(ctx.direction == 'rtl', "ctx.direction == 'rtl'");
+
+  ctx.reset();
+  _assert(ctx.direction == default_value, "ctx.direction == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js
new file mode 100644
index 00000000000..3d6b8350509
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.direction.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.direction
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.direction;
+
+  ctx.direction = 'rtl';
+  _assert(ctx.direction == 'rtl', "ctx.direction == 'rtl'");
+
+  ctx.reset();
+  _assert(ctx.direction == default_value, "ctx.direction == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.html
new file mode 100644
index 00000000000..1fdd2b773a6
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.fill_style</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.fill_style</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fillStyle;
+
+  ctx.fillStyle = '#ffffff';
+  _assert(ctx.fillStyle == '#ffffff', "ctx.fillStyle == '#ffffff'");
+
+  ctx.reset();
+  _assert(ctx.fillStyle == default_value, "ctx.fillStyle == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js
new file mode 100644
index 00000000000..c574824b0ab
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.fill_style.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.fill_style
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fillStyle;
+
+  ctx.fillStyle = '#ffffff';
+  _assert(ctx.fillStyle == '#ffffff', "ctx.fillStyle == '#ffffff'");
+
+  ctx.reset();
+  _assert(ctx.fillStyle == default_value, "ctx.fillStyle == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.html
new file mode 100644
index 00000000000..af898c7dd12
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.filter</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.filter</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.filter;
+
+  ctx.filter = 'blur(10px)';
+  _assert(ctx.filter == 'blur(10px)', "ctx.filter == 'blur(10px)'");
+
+  ctx.reset();
+  _assert(ctx.filter == default_value, "ctx.filter == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js
new file mode 100644
index 00000000000..f781a9fa340
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.filter.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.filter
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.filter;
+
+  ctx.filter = 'blur(10px)';
+  _assert(ctx.filter == 'blur(10px)', "ctx.filter == 'blur(10px)'");
+
+  ctx.reset();
+  _assert(ctx.filter == default_value, "ctx.filter == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.html
new file mode 100644
index 00000000000..69bbf3261e2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.font</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.font</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.font;
+
+  ctx.font = '16px sans-serif';
+  _assert(ctx.font == '16px sans-serif', "ctx.font == '16px sans-serif'");
+
+  ctx.reset();
+  _assert(ctx.font == default_value, "ctx.font == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.worker.js
new file mode 100644
index 00000000000..ea6f4cc1846
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.font
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.font;
+
+  ctx.font = '16px sans-serif';
+  _assert(ctx.font == '16px sans-serif', "ctx.font == '16px sans-serif'");
+
+  ctx.reset();
+  _assert(ctx.font == default_value, "ctx.font == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html
new file mode 100644
index 00000000000..27954486c08
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.font_kerning</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.font_kerning</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fontKerning;
+
+  ctx.fontKerning = 'normal';
+  _assert(ctx.fontKerning == 'normal', "ctx.fontKerning == 'normal'");
+
+  ctx.reset();
+  _assert(ctx.fontKerning == default_value, "ctx.fontKerning == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js
new file mode 100644
index 00000000000..1c21249b9cb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_kerning.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.font_kerning
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fontKerning;
+
+  ctx.fontKerning = 'normal';
+  _assert(ctx.fontKerning == 'normal', "ctx.fontKerning == 'normal'");
+
+  ctx.reset();
+  _assert(ctx.fontKerning == default_value, "ctx.fontKerning == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html
new file mode 100644
index 00000000000..b1e22173207
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.font_stretch</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.font_stretch</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fontStretch;
+
+  ctx.fontStretch = 'ultra-condensed';
+  _assert(ctx.fontStretch == 'ultra-condensed', "ctx.fontStretch == 'ultra-condensed'");
+
+  ctx.reset();
+  _assert(ctx.fontStretch == default_value, "ctx.fontStretch == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js
new file mode 100644
index 00000000000..71bb6aff480
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_stretch.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.font_stretch
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fontStretch;
+
+  ctx.fontStretch = 'ultra-condensed';
+  _assert(ctx.fontStretch == 'ultra-condensed', "ctx.fontStretch == 'ultra-condensed'");
+
+  ctx.reset();
+  _assert(ctx.fontStretch == default_value, "ctx.fontStretch == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html
new file mode 100644
index 00000000000..7d0518c021e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.font_variant_caps</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.font_variant_caps</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fontVariantCaps;
+
+  ctx.fontVariantCaps = 'unicase';
+  _assert(ctx.fontVariantCaps == 'unicase', "ctx.fontVariantCaps == 'unicase'");
+
+  ctx.reset();
+  _assert(ctx.fontVariantCaps == default_value, "ctx.fontVariantCaps == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js
new file mode 100644
index 00000000000..e89a8bda428
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.font_variant_caps.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.font_variant_caps
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.fontVariantCaps;
+
+  ctx.fontVariantCaps = 'unicase';
+  _assert(ctx.fontVariantCaps == 'unicase', "ctx.fontVariantCaps == 'unicase'");
+
+  ctx.reset();
+  _assert(ctx.fontVariantCaps == default_value, "ctx.fontVariantCaps == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html
new file mode 100644
index 00000000000..fe87aedf84b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.global_alpha</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.global_alpha</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.globalAlpha;
+
+  ctx.globalAlpha = 0.5;
+  _assert(ctx.globalAlpha == 0.5, "ctx.globalAlpha == 0.5");
+
+  ctx.reset();
+  _assert(ctx.globalAlpha == default_value, "ctx.globalAlpha == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js
new file mode 100644
index 00000000000..518a8cbb461
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_alpha.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.global_alpha
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.globalAlpha;
+
+  ctx.globalAlpha = 0.5;
+  _assert(ctx.globalAlpha == 0.5, "ctx.globalAlpha == 0.5");
+
+  ctx.reset();
+  _assert(ctx.globalAlpha == default_value, "ctx.globalAlpha == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html
new file mode 100644
index 00000000000..647349c94a2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.global_composite_operation</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.global_composite_operation</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.globalCompositeOperation;
+
+  ctx.globalCompositeOperation = 'destination-over';
+  _assert(ctx.globalCompositeOperation == 'destination-over', "ctx.globalCompositeOperation == 'destination-over'");
+
+  ctx.reset();
+  _assert(ctx.globalCompositeOperation == default_value, "ctx.globalCompositeOperation == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js
new file mode 100644
index 00000000000..c94f15b2325
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.global_composite_operation.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.global_composite_operation
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.globalCompositeOperation;
+
+  ctx.globalCompositeOperation = 'destination-over';
+  _assert(ctx.globalCompositeOperation == 'destination-over', "ctx.globalCompositeOperation == 'destination-over'");
+
+  ctx.reset();
+  _assert(ctx.globalCompositeOperation == default_value, "ctx.globalCompositeOperation == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html
new file mode 100644
index 00000000000..c0b7f29acaa
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.image_smoothing_enabled</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.image_smoothing_enabled</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.imageSmoothingEnabled;
+
+  ctx.imageSmoothingEnabled = false;
+  _assert(ctx.imageSmoothingEnabled == false, "ctx.imageSmoothingEnabled == false");
+
+  ctx.reset();
+  _assert(ctx.imageSmoothingEnabled == default_value, "ctx.imageSmoothingEnabled == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js
new file mode 100644
index 00000000000..7010fb899c1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_enabled.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.image_smoothing_enabled
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.imageSmoothingEnabled;
+
+  ctx.imageSmoothingEnabled = false;
+  _assert(ctx.imageSmoothingEnabled == false, "ctx.imageSmoothingEnabled == false");
+
+  ctx.reset();
+  _assert(ctx.imageSmoothingEnabled == default_value, "ctx.imageSmoothingEnabled == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html
new file mode 100644
index 00000000000..12a6367ff97
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.image_smoothing_quality</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.image_smoothing_quality</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.imageSmoothingQuality;
+
+  ctx.imageSmoothingQuality = 'high';
+  _assert(ctx.imageSmoothingQuality == 'high', "ctx.imageSmoothingQuality == 'high'");
+
+  ctx.reset();
+  _assert(ctx.imageSmoothingQuality == default_value, "ctx.imageSmoothingQuality == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js
new file mode 100644
index 00000000000..74296666911
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.image_smoothing_quality.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.image_smoothing_quality
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.imageSmoothingQuality;
+
+  ctx.imageSmoothingQuality = 'high';
+  _assert(ctx.imageSmoothingQuality == 'high', "ctx.imageSmoothingQuality == 'high'");
+
+  ctx.reset();
+  _assert(ctx.imageSmoothingQuality == default_value, "ctx.imageSmoothingQuality == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html
new file mode 100644
index 00000000000..addb0c62ad2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.letter_spacing</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.letter_spacing</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.letterSpacing;
+
+  ctx.letterSpacing = '12px';
+  _assert(ctx.letterSpacing == '12px', "ctx.letterSpacing == '12px'");
+
+  ctx.reset();
+  _assert(ctx.letterSpacing == default_value, "ctx.letterSpacing == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js
new file mode 100644
index 00000000000..e0dfae0a8e5
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.letter_spacing.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.letter_spacing
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.letterSpacing;
+
+  ctx.letterSpacing = '12px';
+  _assert(ctx.letterSpacing == '12px', "ctx.letterSpacing == '12px'");
+
+  ctx.reset();
+  _assert(ctx.letterSpacing == default_value, "ctx.letterSpacing == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.html
new file mode 100644
index 00000000000..9b528b34483
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.line_cap</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.line_cap</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineCap;
+
+  ctx.lineCap = 'square';
+  _assert(ctx.lineCap == 'square', "ctx.lineCap == 'square'");
+
+  ctx.reset();
+  _assert(ctx.lineCap == default_value, "ctx.lineCap == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js
new file mode 100644
index 00000000000..c3a94f2cbb3
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_cap.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.line_cap
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineCap;
+
+  ctx.lineCap = 'square';
+  _assert(ctx.lineCap == 'square', "ctx.lineCap == 'square'");
+
+  ctx.reset();
+  _assert(ctx.lineCap == default_value, "ctx.lineCap == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.html
new file mode 100644
index 00000000000..fd4edf58cf0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.line_dash</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.line_dash</h1>
+<p class="desc">check that the line dash is reset</p>
+
+
+<script>
+var t = async_test("check that the line dash is reset");
+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');
+
+  ctx.setLineDash([1, 2]);
+
+  ctx.reset();
+  _assert(ctx.getLineDash().length == 0, "ctx.getLineDash().length == 0");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js
new file mode 100644
index 00000000000..841475d8760
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash.worker.js
@@ -0,0 +1,25 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.line_dash
+// Description:check that the line dash is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the line dash is reset");
+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');
+
+  ctx.setLineDash([1, 2]);
+
+  ctx.reset();
+  _assert(ctx.getLineDash().length == 0, "ctx.getLineDash().length == 0");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html
new file mode 100644
index 00000000000..475db49f82d
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.line_dash_offset</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.line_dash_offset</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineDashOffset;
+
+  ctx.lineDashOffset = 1.0;
+  _assert(ctx.lineDashOffset == 1.0, "ctx.lineDashOffset == 1.0");
+
+  ctx.reset();
+  _assert(ctx.lineDashOffset == default_value, "ctx.lineDashOffset == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js
new file mode 100644
index 00000000000..5e0d8dd47c8
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_dash_offset.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.line_dash_offset
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineDashOffset;
+
+  ctx.lineDashOffset = 1.0;
+  _assert(ctx.lineDashOffset == 1.0, "ctx.lineDashOffset == 1.0");
+
+  ctx.reset();
+  _assert(ctx.lineDashOffset == default_value, "ctx.lineDashOffset == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.html
new file mode 100644
index 00000000000..793c1d9bc4b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.line_join</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.line_join</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineJoin;
+
+  ctx.lineJoin = 'bevel';
+  _assert(ctx.lineJoin == 'bevel', "ctx.lineJoin == 'bevel'");
+
+  ctx.reset();
+  _assert(ctx.lineJoin == default_value, "ctx.lineJoin == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js
new file mode 100644
index 00000000000..9d5e76757b1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_join.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.line_join
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineJoin;
+
+  ctx.lineJoin = 'bevel';
+  _assert(ctx.lineJoin == 'bevel', "ctx.lineJoin == 'bevel'");
+
+  ctx.reset();
+  _assert(ctx.lineJoin == default_value, "ctx.lineJoin == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.html
new file mode 100644
index 00000000000..8cdf45f7005
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.line_width</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.line_width</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineWidth;
+
+  ctx.lineWidth = 1;
+  _assert(ctx.lineWidth == 1, "ctx.lineWidth == 1");
+
+  ctx.reset();
+  _assert(ctx.lineWidth == default_value, "ctx.lineWidth == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js
new file mode 100644
index 00000000000..1e28f93d66a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.line_width.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.line_width
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.lineWidth;
+
+  ctx.lineWidth = 1;
+  _assert(ctx.lineWidth == 1, "ctx.lineWidth == 1");
+
+  ctx.reset();
+  _assert(ctx.lineWidth == default_value, "ctx.lineWidth == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html
new file mode 100644
index 00000000000..7f47f9a6be0
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.miter_limit</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.miter_limit</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.miterLimit;
+
+  ctx.miterLimit = 1.0;
+  _assert(ctx.miterLimit == 1.0, "ctx.miterLimit == 1.0");
+
+  ctx.reset();
+  _assert(ctx.miterLimit == default_value, "ctx.miterLimit == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js
new file mode 100644
index 00000000000..3945a662d49
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.miter_limit.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.miter_limit
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.miterLimit;
+
+  ctx.miterLimit = 1.0;
+  _assert(ctx.miterLimit == 1.0, "ctx.miterLimit == 1.0");
+
+  ctx.reset();
+  _assert(ctx.miterLimit == default_value, "ctx.miterLimit == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html
new file mode 100644
index 00000000000..e7075ce102e
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.shadow_blur</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.shadow_blur</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowBlur;
+
+  ctx.shadowBlur = 10.0;
+  _assert(ctx.shadowBlur == 10.0, "ctx.shadowBlur == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowBlur == default_value, "ctx.shadowBlur == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js
new file mode 100644
index 00000000000..d82933169d1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_blur.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.shadow_blur
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowBlur;
+
+  ctx.shadowBlur = 10.0;
+  _assert(ctx.shadowBlur == 10.0, "ctx.shadowBlur == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowBlur == default_value, "ctx.shadowBlur == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html
new file mode 100644
index 00000000000..ad928acf46a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.shadow_color</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.shadow_color</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowColor;
+
+  ctx.shadowColor = '#ff0000';
+  _assert(ctx.shadowColor == '#ff0000', "ctx.shadowColor == '#ff0000'");
+
+  ctx.reset();
+  _assert(ctx.shadowColor == default_value, "ctx.shadowColor == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js
new file mode 100644
index 00000000000..6ad1e83be22
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_color.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.shadow_color
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowColor;
+
+  ctx.shadowColor = '#ff0000';
+  _assert(ctx.shadowColor == '#ff0000', "ctx.shadowColor == '#ff0000'");
+
+  ctx.reset();
+  _assert(ctx.shadowColor == default_value, "ctx.shadowColor == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html
new file mode 100644
index 00000000000..e3742e4dbc3
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.shadow_offset_x</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.shadow_offset_x</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowOffsetX;
+
+  ctx.shadowOffsetX = 10.0;
+  _assert(ctx.shadowOffsetX == 10.0, "ctx.shadowOffsetX == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowOffsetX == default_value, "ctx.shadowOffsetX == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js
new file mode 100644
index 00000000000..4247820a4d1
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_x.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.shadow_offset_x
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowOffsetX;
+
+  ctx.shadowOffsetX = 10.0;
+  _assert(ctx.shadowOffsetX == 10.0, "ctx.shadowOffsetX == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowOffsetX == default_value, "ctx.shadowOffsetX == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html
new file mode 100644
index 00000000000..64901ef492b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.shadow_offset_y</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.shadow_offset_y</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowOffsetY;
+
+  ctx.shadowOffsetY = 10.0;
+  _assert(ctx.shadowOffsetY == 10.0, "ctx.shadowOffsetY == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowOffsetY == default_value, "ctx.shadowOffsetY == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js
new file mode 100644
index 00000000000..0c1926ebcaa
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.shadow_offset_y.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.shadow_offset_y
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.shadowOffsetY;
+
+  ctx.shadowOffsetY = 10.0;
+  _assert(ctx.shadowOffsetY == 10.0, "ctx.shadowOffsetY == 10.0");
+
+  ctx.reset();
+  _assert(ctx.shadowOffsetY == default_value, "ctx.shadowOffsetY == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html
new file mode 100644
index 00000000000..79803b28288
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.stroke_style</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.stroke_style</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.strokeStyle;
+
+  ctx.strokeStyle = '#ffffff';
+  _assert(ctx.strokeStyle == '#ffffff', "ctx.strokeStyle == '#ffffff'");
+
+  ctx.reset();
+  _assert(ctx.strokeStyle == default_value, "ctx.strokeStyle == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js
new file mode 100644
index 00000000000..99e1eaaed58
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.stroke_style.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.stroke_style
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.strokeStyle;
+
+  ctx.strokeStyle = '#ffffff';
+  _assert(ctx.strokeStyle == '#ffffff', "ctx.strokeStyle == '#ffffff'");
+
+  ctx.reset();
+  _assert(ctx.strokeStyle == default_value, "ctx.strokeStyle == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.html
new file mode 100644
index 00000000000..c1a33d6f3df
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.text_align</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.text_align</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.textAlign;
+
+  ctx.textAlign = 'end';
+  _assert(ctx.textAlign == 'end', "ctx.textAlign == 'end'");
+
+  ctx.reset();
+  _assert(ctx.textAlign == default_value, "ctx.textAlign == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js
new file mode 100644
index 00000000000..087d3195e41
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_align.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.text_align
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.textAlign;
+
+  ctx.textAlign = 'end';
+  _assert(ctx.textAlign == 'end', "ctx.textAlign == 'end'");
+
+  ctx.reset();
+  _assert(ctx.textAlign == default_value, "ctx.textAlign == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html
new file mode 100644
index 00000000000..acb56e4a008
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.text_baseline</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.text_baseline</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.textBaseline;
+
+  ctx.textBaseline = 'middle';
+  _assert(ctx.textBaseline == 'middle', "ctx.textBaseline == 'middle'");
+
+  ctx.reset();
+  _assert(ctx.textBaseline == default_value, "ctx.textBaseline == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js
new file mode 100644
index 00000000000..9a171326cb2
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_baseline.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.text_baseline
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.textBaseline;
+
+  ctx.textBaseline = 'middle';
+  _assert(ctx.textBaseline == 'middle', "ctx.textBaseline == 'middle'");
+
+  ctx.reset();
+  _assert(ctx.textBaseline == default_value, "ctx.textBaseline == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html
new file mode 100644
index 00000000000..174dbb38014
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.text_rendering</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.text_rendering</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.textRendering;
+
+  ctx.textRendering = 'geometricPrecision';
+  _assert(ctx.textRendering == 'geometricPrecision', "ctx.textRendering == 'geometricPrecision'");
+
+  ctx.reset();
+  _assert(ctx.textRendering == default_value, "ctx.textRendering == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js
new file mode 100644
index 00000000000..df4cea10445
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.text_rendering.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.text_rendering
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.textRendering;
+
+  ctx.textRendering = 'geometricPrecision';
+  _assert(ctx.textRendering == 'geometricPrecision', "ctx.textRendering == 'geometricPrecision'");
+
+  ctx.reset();
+  _assert(ctx.textRendering == default_value, "ctx.textRendering == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html
new file mode 100644
index 00000000000..c30e459b302
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.transformation_matrix</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.transformation_matrix</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  ctx.scale(2, 2);
+
+  ctx.reset();
+  _assert(ctx.getTransform().isIdentity, "ctx.getTransform().isIdentity");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js
new file mode 100644
index 00000000000..2ae105c20e9
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.transformation_matrix.worker.js
@@ -0,0 +1,25 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.transformation_matrix
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  ctx.scale(2, 2);
+
+  ctx.reset();
+  _assert(ctx.getTransform().isIdentity, "ctx.getTransform().isIdentity");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html
new file mode 100644
index 00000000000..470db2cf980
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.reset.state.word_spacing</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.reset.state.word_spacing</h1>
+<p class="desc">check that the state is reset</p>
+
+
+<script>
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.wordSpacing;
+
+  ctx.wordSpacing = '12px';
+  _assert(ctx.wordSpacing == '12px', "ctx.wordSpacing == '12px'");
+
+  ctx.reset();
+  _assert(ctx.wordSpacing == default_value, "ctx.wordSpacing == default_value");
+  t.done();
+
+});
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js
new file mode 100644
index 00000000000..9e8c717f78a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/reset/2d.reset.state.word_spacing.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.reset.state.word_spacing
+// Description:check that the state is reset
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("check that the state is reset");
+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');
+
+  const default_value = ctx.wordSpacing;
+
+  ctx.wordSpacing = '12px';
+  _assert(ctx.wordSpacing == '12px', "ctx.wordSpacing == '12px'");
+
+  ctx.reset();
+  _assert(ctx.wordSpacing == default_value, "ctx.wordSpacing == default_value");
+  t.done();
+});
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/reference/fontVariantCaps-1-ref.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html
similarity index 100%
rename from tests/wpt/tests/html/canvas/offscreen/text/reference/fontVariantCaps-1-ref.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1-expected.html
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-1.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html
similarity index 96%
rename from tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-1.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html
index aed6f660384..a2da7f557ce 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-1.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps1.html
@@ -4,7 +4,7 @@
 <title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-1-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps1-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="canvas1"></canvas>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/reference/fontVariantCaps-2-ref.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2-unexpected.html
similarity index 100%
rename from tests/wpt/tests/html/canvas/offscreen/text/reference/fontVariantCaps-2-ref.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2-unexpected.html
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-2.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html
similarity index 95%
rename from tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-2.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html
index 7d8fc08cfe6..8a644fbb616 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-2.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps2.html
@@ -4,7 +4,7 @@
 <title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="mismatch" href="reference/fontVariantCaps-2-ref.html">
+<link rel="mismatch" href="2d.text.fontVariantCaps2-unexpected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="canvas1"></canvas>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/reference/fontVariantCaps-3-ref.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html
similarity index 100%
rename from tests/wpt/tests/html/canvas/offscreen/text/reference/fontVariantCaps-3-ref.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3-expected.html
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-3.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html
similarity index 96%
rename from tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-3.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html
index 8e9ddd464a0..665a176087f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-3.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps3.html
@@ -4,7 +4,7 @@
 <title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-3-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps3-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="canvas1"></canvas>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html
new file mode 100644
index 00000000000..8d96d0ab032
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4-expected.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML OffscreenCanvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c1"></canvas>
+<br>
+<canvas id="c2"></canvas>
+
+<script>
+for (let c = 1; c <= 2; ++c) {
+  let ctx = document.getElementById("c" + c).getContext("2d");
+  ctx.font = "small-caps 32px serif";
+  ctx.fillText("hello world", 20, 100);
+}
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-4.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html
similarity index 96%
rename from tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-4.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html
index d2f4439897d..84c5fbb4469 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-4.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps4.html
@@ -4,7 +4,7 @@
 <title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-3-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps4-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="canvas1"></canvas>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html
new file mode 100644
index 00000000000..942bcdec9cb
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5-expected.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML OffscreenCanvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c1"></canvas>
+<br>
+<canvas id="c2"></canvas>
+
+<script>
+for (let c = 1; c <= 2; ++c) {
+  let ctx = document.getElementById("c" + c).getContext("2d");
+  ctx.font = "small-caps 32px serif";
+  ctx.fillText("Hello World", 20, 100);
+}
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-5.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html
similarity index 96%
rename from tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-5.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html
index 57b6ca70776..877d890ccc6 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-5.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps5.html
@@ -4,7 +4,7 @@
 <title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-1-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps5-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="canvas1"></canvas>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html
new file mode 100644
index 00000000000..dbcb8abd76a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6-expected.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>HTML OffscreenCanvas reference</title>
+<link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+
+<canvas id="c1"></canvas>
+<br>
+<canvas id="c2"></canvas>
+
+<script>
+for (let c = 1; c <= 2; ++c) {
+  let ctx = document.getElementById("c" + c).getContext("2d");
+  ctx.font = "32px serif";
+  ctx.fillText("Hello World", 20, 100);
+}
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-6.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html
similarity index 96%
rename from tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-6.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html
index 09ff6fab0c6..08c70a3a2e2 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/fontVariantCaps-6.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.fontVariantCaps6.html
@@ -4,7 +4,7 @@
 <title>HTML OffscreenCanvas Test: the 'fontVariantCaps' property</title>
 <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
 <link rel="help" href="https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-fontvariantcaps">
-<link rel="match" href="reference/fontVariantCaps-2-ref.html">
+<link rel="match" href="2d.text.fontVariantCaps6-expected.html">
 <meta name="assert" content="text rendering respects the fontVariantCaps property">
 
 <canvas id="canvas1"></canvas>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html
new file mode 100644
index 00000000000..2e2e5dde672
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.text.measure.emHeights-low-ascent</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.emHeights-low-ascent</h1>
+<p class="desc">Testing emHeights with reduced ascent metric</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest-ascent256", "url('/fonts/CanvasTest-ascent256.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+  ctx.font = '40px CanvasTest-ascent256';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').emHeightAscent, 20, "ctx.measureText('A').emHeightAscent", "20");
+  _assertSame(ctx.measureText('A').emHeightDescent, 20, "ctx.measureText('A').emHeightDescent", "20");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
+
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 20, "ctx.measureText('ABCD').emHeightAscent", "20");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 20, "ctx.measureText('ABCD').emHeightDescent", "20");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
+
+}, "Testing emHeights with reduced ascent metric");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.worker.js
new file mode 100644
index 00000000000..09ee7873092
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-low-ascent.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.emHeights-low-ascent
+// Description:Testing emHeights with reduced ascent metric
+// 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("CanvasTest-ascent256", "url('/fonts/CanvasTest-ascent256.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+  ctx.font = '40px CanvasTest-ascent256';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').emHeightAscent, 20, "ctx.measureText('A').emHeightAscent", "20");
+  _assertSame(ctx.measureText('A').emHeightDescent, 20, "ctx.measureText('A').emHeightDescent", "20");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
+
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 20, "ctx.measureText('ABCD').emHeightAscent", "20");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 20, "ctx.measureText('ABCD').emHeightDescent", "20");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
+  t.done();
+}, "Testing emHeights with reduced ascent metric");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html
new file mode 100644
index 00000000000..e39c08ce821
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.text.measure.emHeights-zero-descent</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.emHeights-zero-descent</h1>
+<p class="desc">Testing emHeights with zero descent metric</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest-descent0", "url('/fonts/CanvasTest-descent0.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+  ctx.font = '40px CanvasTest-descent0';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightAscent", "40");
+  _assertSame(ctx.measureText('A').emHeightDescent, 0, "ctx.measureText('A').emHeightDescent", "0");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
+
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightAscent", "40");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 0, "ctx.measureText('ABCD').emHeightDescent", "0");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
+
+}, "Testing emHeights with zero descent metric");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.worker.js
new file mode 100644
index 00000000000..a2f09782c98
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights-zero-descent.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.emHeights-zero-descent
+// Description:Testing emHeights with zero descent metric
+// 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("CanvasTest-descent0", "url('/fonts/CanvasTest-descent0.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+  ctx.font = '40px CanvasTest-descent0';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightAscent", "40");
+  _assertSame(ctx.measureText('A').emHeightDescent, 0, "ctx.measureText('A').emHeightDescent", "0");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
+
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightAscent", "40");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 0, "ctx.measureText('ABCD').emHeightDescent", "0");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
+  t.done();
+}, "Testing emHeights with zero descent metric");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html
index a92ce58a00e..0764279df31 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.html
@@ -19,16 +19,16 @@ promise_test(async t => {
   f.load();
   document.fonts.add(f);
   await document.fonts.ready;
-  ctx.font = '50px CanvasTest';
+  ctx.font = '40px CanvasTest';
   ctx.direction = 'ltr';
   ctx.align = 'left'
-  _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
-  _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
-  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
+  _assertSame(ctx.measureText('A').emHeightAscent, 30, "ctx.measureText('A').emHeightAscent", "30");
+  _assertSame(ctx.measureText('A').emHeightDescent, 10, "ctx.measureText('A').emHeightDescent", "10");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
 
-  _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
-  _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
-  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 30, "ctx.measureText('ABCD').emHeightAscent", "30");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 10, "ctx.measureText('ABCD').emHeightDescent", "10");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
 
 }, "Testing emHeights");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js
index 68db6de88d0..0385d3d737d 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.emHeights.worker.js
@@ -15,16 +15,16 @@ promise_test(async t => {
   f.load();
   self.fonts.add(f);
   await self.fonts.ready;
-  ctx.font = '50px CanvasTest';
+  ctx.font = '40px CanvasTest';
   ctx.direction = 'ltr';
   ctx.align = 'left'
-  _assertSame(ctx.measureText('A').emHeightAscent, 37.5, "ctx.measureText('A').emHeightAscent", "37.5");
-  _assertSame(ctx.measureText('A').emHeightDescent, 12.5, "ctx.measureText('A').emHeightDescent", "12.5");
-  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 50, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "50");
+  _assertSame(ctx.measureText('A').emHeightAscent, 30, "ctx.measureText('A').emHeightAscent", "30");
+  _assertSame(ctx.measureText('A').emHeightDescent, 10, "ctx.measureText('A').emHeightDescent", "10");
+  _assertSame(ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent, 40, "ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent", "40");
 
-  _assertSame(ctx.measureText('ABCD').emHeightAscent, 37.5, "ctx.measureText('ABCD').emHeightAscent", "37.5");
-  _assertSame(ctx.measureText('ABCD').emHeightDescent, 12.5, "ctx.measureText('ABCD').emHeightDescent", "12.5");
-  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 50, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "50");
+  _assertSame(ctx.measureText('ABCD').emHeightAscent, 30, "ctx.measureText('ABCD').emHeightAscent", "30");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent, 10, "ctx.measureText('ABCD').emHeightDescent", "10");
+  _assertSame(ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent, 40, "ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent", "40");
   t.done();
 }, "Testing emHeights");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html
new file mode 100644
index 00000000000..51eb2c822c4
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.text.measure.fontBoundingBox-reduced-ascent</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.fontBoundingBox-reduced-ascent</h1>
+<p class="desc">Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest-ascent256", "url('/fonts/CanvasTest-ascent256.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+  ctx.font = '40px CanvasTest-ascent256';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 10, "ctx.measureText('A').fontBoundingBoxAscent", "10");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 10, "ctx.measureText('A').fontBoundingBoxDescent", "10");
+
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 10, "ctx.measureText('ABCD').fontBoundingBoxAscent", "10");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 10, "ctx.measureText('ABCD').fontBoundingBoxDescent", "10");
+
+}, "Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js
new file mode 100644
index 00000000000..dea67ff8f67
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-reduced-ascent.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.text.measure.fontBoundingBox-reduced-ascent
+// Description:Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric
+// 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("CanvasTest-ascent256", "url('/fonts/CanvasTest-ascent256.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+  ctx.font = '40px CanvasTest-ascent256';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 10, "ctx.measureText('A').fontBoundingBoxAscent", "10");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 10, "ctx.measureText('A').fontBoundingBoxDescent", "10");
+
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 10, "ctx.measureText('ABCD').fontBoundingBoxAscent", "10");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 10, "ctx.measureText('ABCD').fontBoundingBoxDescent", "10");
+  t.done();
+}, "Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html
new file mode 100644
index 00000000000..ea65e58b5c5
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.text.measure.fontBoundingBox-zero-descent</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.fontBoundingBox-zero-descent</h1>
+<p class="desc">Testing fontBoundingBox for OffscreenCanvas with zero descent metric</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest-descent0", "url('/fonts/CanvasTest-descent0.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+  ctx.font = '40px CanvasTest-descent0';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 30, "ctx.measureText('A').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 0, "ctx.measureText('A').fontBoundingBoxDescent", "0");
+
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 30, "ctx.measureText('ABCD').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 0, "ctx.measureText('ABCD').fontBoundingBoxDescent", "0");
+
+}, "Testing fontBoundingBox for OffscreenCanvas with zero descent metric");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js
new file mode 100644
index 00000000000..99a886d015c
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox-zero-descent.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.text.measure.fontBoundingBox-zero-descent
+// Description:Testing fontBoundingBox for OffscreenCanvas with zero descent metric
+// 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("CanvasTest-descent0", "url('/fonts/CanvasTest-descent0.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+  ctx.font = '40px CanvasTest-descent0';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 30, "ctx.measureText('A').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 0, "ctx.measureText('A').fontBoundingBoxDescent", "0");
+
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 30, "ctx.measureText('ABCD').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 0, "ctx.measureText('ABCD').fontBoundingBoxDescent", "0");
+  t.done();
+}, "Testing fontBoundingBox for OffscreenCanvas with zero descent metric");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html
index e3278033426..36b11f31d7f 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.html
@@ -19,15 +19,14 @@ promise_test(async t => {
   f.load();
   document.fonts.add(f);
   await document.fonts.ready;
-  ctx.font = '50px CanvasTest';
+  ctx.font = '40px CanvasTest';
   ctx.direction = 'ltr';
   ctx.align = 'left'
-  // approx_equals because font metrics may be rounded slightly differently by different platforms/browsers.
-  assert_approx_equals(ctx.measureText('A').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-  assert_approx_equals(ctx.measureText('A').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 30, "ctx.measureText('A').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 10, "ctx.measureText('A').fontBoundingBoxDescent", "10");
 
-  assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-  assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 30, "ctx.measureText('ABCD').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 10, "ctx.measureText('ABCD').fontBoundingBoxDescent", "10");
 
 }, "Testing fontBoundingBox measurements");
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js
index ca272760fd4..b2cde04c0da 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.fontBoundingBox.worker.js
@@ -15,15 +15,14 @@ promise_test(async t => {
   f.load();
   self.fonts.add(f);
   await self.fonts.ready;
-  ctx.font = '50px CanvasTest';
+  ctx.font = '40px CanvasTest';
   ctx.direction = 'ltr';
   ctx.align = 'left'
-  // approx_equals because font metrics may be rounded slightly differently by different platforms/browsers.
-  assert_approx_equals(ctx.measureText('A').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-  assert_approx_equals(ctx.measureText('A').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+  _assertSame(ctx.measureText('A').fontBoundingBoxAscent, 30, "ctx.measureText('A').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('A').fontBoundingBoxDescent, 10, "ctx.measureText('A').fontBoundingBoxDescent", "10");
 
-  assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-  assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxAscent, 30, "ctx.measureText('ABCD').fontBoundingBoxAscent", "30");
+  _assertSame(ctx.measureText('ABCD').fontBoundingBoxDescent, 10, "ctx.measureText('ABCD').fontBoundingBoxDescent", "10");
   t.done();
 }, "Testing fontBoundingBox measurements");
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js
index 8c4e7cfe961..930f7722ee0 100644
--- a/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js
+++ b/tests/wpt/tests/html/canvas/offscreen/the-offscreen-canvas/2d-getcontext-options.any.js
@@ -37,5 +37,10 @@ test(() => {
   assert_array_equals(actual, expected, "order of operations (creation)");
   actual = [];
   assert_equals(canvas.getContext('2d', options), context, "cached context");
-  assert_array_equals(actual, expected, "order of operations (caching)");
+  // Getting the cached context does not involve the options argument at all;
+  // the context retains its existing settings, and the new options (if any)
+  // are ignored.
+  // Therefore, there is no expectation that the 'options' dictionary will be
+  // accessed again here, and we cannot predict the contents, if any, of the
+  // 'actual' array.
 });
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml
index babe3a4f5b1..dd33e05a4d8 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/layers.yaml
@@ -55,6 +55,7 @@
         ctx.shadowOffsetX = -10;
         ctx.shadowOffsetY = 10;
         ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+        ctx.shadowBlur = 3;
     alpha.blending:
       render_states: |-
         ctx.globalAlpha = 0.6;
@@ -69,6 +70,7 @@
         ctx.shadowOffsetX = -10;
         ctx.shadowOffsetY = 10;
         ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+        ctx.shadowBlur = 3;
     alpha.blending.shadow:
       render_states: |-
         ctx.globalAlpha = 0.6;
@@ -76,6 +78,7 @@
         ctx.shadowOffsetX = -10;
         ctx.shadowOffsetY = 10;
         ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+        ctx.shadowBlur = 3;
     alpha.composite.shadow:
       render_states: |-
         ctx.globalAlpha = 0.6;
@@ -83,18 +86,21 @@
         ctx.shadowOffsetX = -10;
         ctx.shadowOffsetY = 10;
         ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+        ctx.shadowBlur = 3;
     blending.shadow:
       render_states: |-
         ctx.globalCompositeOperation = 'multiply';
         ctx.shadowOffsetX = -10;
         ctx.shadowOffsetY = 10;
         ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+        ctx.shadowBlur = 3;
     composite.shadow:
       render_states: |-
         ctx.globalCompositeOperation = 'source-in';
         ctx.shadowOffsetX = -10;
         ctx.shadowOffsetY = 10;
         ctx.shadowColor = 'rgba(255, 165, 0, 0.5)';
+        ctx.shadowBlur = 3;
 
 
 - name: 2d.layer.global-states.filter
@@ -164,6 +170,27 @@
     img.src = 'data:image/svg+xml;base64,' + btoa(svg);
   variants: *global-state-variants
 
+- name: 2d.layer.global-filter
+  desc: Tests that layers ignore the global context filter.
+  size: [150, 100]
+  code: |
+    ctx.filter = 'blur(5px)'
+
+    ctx.beginLayer();
+    ctx.fillRect(10, 10, 30, 30);  // `ctx.filter` applied to draw call.
+    ctx.endLayer();
+
+    ctx.beginLayer();
+    ctx.filter = 'none';
+    ctx.fillRect(60, 10, 30, 30);  // Should not be filted by the layer.
+    ctx.endLayer();
+
+    ctx.fillRect(110, 10, 30, 30);  // `ctx.filter` is still set.
+  reference: |
+    ctx.fillRect(60, 10, 30, 30);
+    ctx.filter = 'blur(5px)'
+    ctx.fillRect(10, 10, 30, 30);
+    ctx.fillRect(110, 10, 30, 30);
 
 - name: 2d.layer.nested
   desc: Tests nested canvas layers.
@@ -246,6 +273,40 @@
 
     ctx.fillRect(70, 70, 75, 50);
 
+- name: 2d.layer.layer-rendering-state-reset-in-layer
+  desc: Tests that layers ignore the global context filter.
+  code: |
+    ctx.globalAlpha = 0.5;
+    ctx.globalCompositeOperation = 'xor';
+    ctx.shadowColor = '#0000ff';
+    ctx.shadowOffsetX = 10;
+    ctx.shadowOffsetY = 20;
+    ctx.shadowBlur = 30;
+
+    @assert ctx.globalAlpha === 0.5;
+    @assert ctx.globalCompositeOperation === 'xor';
+    @assert ctx.shadowColor === '#0000ff';
+    @assert ctx.shadowOffsetX === 10;
+    @assert ctx.shadowOffsetY === 20;
+    @assert ctx.shadowBlur === 30;
+
+    ctx.beginLayer();
+
+    @assert ctx.globalAlpha === 1.0;
+    @assert ctx.globalCompositeOperation === 'source-over';
+    @assert ctx.shadowColor === 'rgba(0, 0, 0, 0)';
+    @assert ctx.shadowOffsetX === 0;
+    @assert ctx.shadowOffsetY === 0;
+    @assert ctx.shadowBlur === 0;
+
+    ctx.endLayer();
+
+    @assert ctx.globalAlpha === 0.5;
+    @assert ctx.globalCompositeOperation === 'xor';
+    @assert ctx.shadowColor === '#0000ff';
+    @assert ctx.shadowOffsetX === 10;
+    @assert ctx.shadowOffsetY === 20;
+    @assert ctx.shadowBlur === 30;
 
 - name: 2d.layer.unclosed
   desc: Check that layers are rendered even if not closed.
@@ -435,7 +496,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'orange';
-
+    ctx.shadowBlur = 3
 
     for (let i = 0; i < 5; i++) {
       ctx.beginLayer();
@@ -455,6 +516,7 @@
     ctx.shadowOffsetX = -10;
     ctx.shadowOffsetY = 10;
     ctx.shadowColor = 'orange';
+    ctx.shadowBlur = 3;
 
     var canvas2 = [5];
     var ctx2 = [5];
@@ -479,6 +541,7 @@
     ctx.shadowOffsetX = -3;
     ctx.shadowOffsetY = 3;
     ctx.shadowColor = 'rgba(0, 30, 0, 0.3)';
+    ctx.shadowBlur = 3;
 
     ctx.beginLayer({filter: {name: 'dropShadow', dx: -3, dy: 3}});
 
@@ -488,6 +551,7 @@
     ctx.shadowOffsetX = -6;
     ctx.shadowOffsetY = 6;
     ctx.shadowColor = 'rgba(0, 60, 0, 0.6)';
+    ctx.shadowBlur = 3;
 
     ctx.reset();
 
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml
index 4107166248a..fdb7f815c27 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/reset.yaml
@@ -1,7 +1,5 @@
 - name: 2d.reset.basic
   desc: reset clears to transparent black
-  canvasType:
-    ['HTMLCanvas']
   code: |
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
@@ -12,4 +10,156 @@
     @assert pixel 100,50 == 0,0,0,0;
     @assert pixel 0,50 == 0,0,0,0;
     @assert pixel 100,0 == 0,0,0,0;
-    t.done();
\ No newline at end of file
+    t.done();
+
+- name: 2d.reset.state
+  desc: check that the state is reset
+  code: |
+    const default_value = ctx.{{ state_name }};
+
+    ctx.{{ state_name }} = {{ new_value }};
+    @assert ctx.{{ state_name }} == {{ new_value }};
+
+    ctx.reset();
+    @assert ctx.{{ state_name }} == default_value;
+
+  variants:
+    letter_spacing:
+      state_name: letterSpacing
+      new_value: "'12px'"
+
+    word_spacing:
+      state_name: wordSpacing
+      new_value: "'12px'"
+
+    fill_style:
+      state_name: fillStyle
+      new_value: "'#ffffff'"
+
+    stroke_style:
+      state_name: strokeStyle
+      new_value: "'#ffffff'"
+
+    filter:
+      state_name: filter
+      new_value: "'blur(10px)'"
+
+    font:
+      state_name: font
+      new_value: "'25px sans-serif'"
+
+    global_alpha:
+      state_name: globalAlpha
+      new_value: 0.5
+
+    global_composite_operation:
+      state_name: globalCompositeOperation
+      new_value: "'destination-over'"
+
+    line_width:
+      state_name: lineWidth
+      new_value: 1
+
+    line_cap:
+      state_name: lineCap
+      new_value: "'square'"
+
+    line_join:
+      state_name: lineJoin
+      new_value: "'bevel'"
+
+    miter_limit:
+      state_name: miterLimit
+      new_value: 1.0
+
+    line_dash_offset:
+      state_name: lineDashOffset
+      new_value: 1.0
+
+    shadow_offset_x:
+      state_name: shadowOffsetX
+      new_value: 10.0
+
+    shadow_offset_y:
+      state_name: shadowOffsetY
+      new_value: 10.0
+
+    shadow_blur:
+      state_name: shadowBlur
+      new_value: 10.0
+
+    shadow_color:
+      state_name: shadowColor
+      new_value: "'#ff0000'"
+
+    font:
+      state_name: font
+      new_value: "'16px sans-serif'"
+
+    text_align:
+      state_name: textAlign
+      new_value: "'end'"
+
+    text_baseline:
+      state_name: textBaseline
+      new_value: "'middle'"
+
+    direction:
+      state_name: direction
+      new_value: "'rtl'"
+
+    font_kerning:
+      state_name: fontKerning
+      new_value: "'normal'"
+
+    font_stretch:
+      state_name: fontStretch
+      new_value: "'ultra-condensed'"
+
+    font_variant_caps:
+      state_name: fontVariantCaps
+      new_value: "'unicase'"
+
+    text_rendering:
+      state_name: textRendering
+      new_value: "'geometricPrecision'"
+
+    image_smoothing_enabled:
+      state_name: imageSmoothingEnabled
+      new_value: "false"
+
+    image_smoothing_quality:
+      state_name: imageSmoothingQuality
+      new_value: "'high'"
+
+- name: 2d.reset.state.transformation_matrix
+  desc: check that the state is reset
+  code: |
+    ctx.scale(2, 2);
+
+    ctx.reset();
+    @assert ctx.getTransform().isIdentity;
+
+- name: 2d.reset.state.clip
+  desc: check that the clip is reset
+  size: [200, 200]
+  code: |
+    ctx.beginPath();
+    ctx.rect(0, 0, 100, 100);
+    ctx.clip();
+
+    ctx.fillRect(0, 0, 200, 200);
+
+    ctx.reset();
+
+    ctx.fillRect(0, 0, 200, 200);
+  reference: |
+    ctx.fillRect(0, 0, 200, 200);
+
+- name: 2d.reset.state.line_dash
+  desc: check that the line dash is reset
+  code: |
+    ctx.setLineDash([1, 2]);
+
+    ctx.reset();
+    @assert ctx.getLineDash().length == 0;
\ No newline at end of file
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
index de28898152f..93c86b8b5e5 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
@@ -1060,15 +1060,14 @@
   - CanvasTest
   code: |
     {{ load_font }}
-    ctx.font = '50px CanvasTest';
+    ctx.font = '40px CanvasTest';
     ctx.direction = 'ltr';
     ctx.align = 'left'
-    // approx_equals because font metrics may be rounded slightly differently by different platforms/browsers.
-    assert_approx_equals(ctx.measureText('A').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-    assert_approx_equals(ctx.measureText('A').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+    @assert ctx.measureText('A').fontBoundingBoxAscent === 30;
+    @assert ctx.measureText('A').fontBoundingBoxDescent === 10;
 
-    assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxAscent, 50 * 1745 / 1024, 1, "unexpected fontBoundingBoxAscent");
-    assert_approx_equals(ctx.measureText('ABCD').fontBoundingBoxDescent, 50 * 805 / 1024, 1, "unexpected fontBoundingBoxDescent");
+    @assert ctx.measureText('ABCD').fontBoundingBoxAscent === 30;
+    @assert ctx.measureText('ABCD').fontBoundingBoxDescent === 10;
   variants: *load-font-variant-definition
 
 - name: 2d.text.measure.fontBoundingBox.ahem
@@ -1087,6 +1086,40 @@
     @assert ctx.measureText('ABCD').fontBoundingBoxDescent === 10;
   variants: *load-font-variant-definition
 
+- name: 2d.text.measure.fontBoundingBox-reduced-ascent
+  desc: Testing fontBoundingBox for OffscreenCanvas with reduced ascent metric
+  test_type: promise
+  fonts:
+  - CanvasTest-ascent256
+  code: |
+    {{ load_font }}
+    ctx.font = '40px CanvasTest-ascent256';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    @assert ctx.measureText('A').fontBoundingBoxAscent === 10;
+    @assert ctx.measureText('A').fontBoundingBoxDescent === 10;
+
+    @assert ctx.measureText('ABCD').fontBoundingBoxAscent === 10;
+    @assert ctx.measureText('ABCD').fontBoundingBoxDescent === 10;
+  variants: *load-font-variant-definition
+
+- name: 2d.text.measure.fontBoundingBox-zero-descent
+  desc: Testing fontBoundingBox for OffscreenCanvas with zero descent metric
+  test_type: promise
+  fonts:
+  - CanvasTest-descent0
+  code: |
+    {{ load_font }}
+    ctx.font = '40px CanvasTest-descent0';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    @assert ctx.measureText('A').fontBoundingBoxAscent === 30;
+    @assert ctx.measureText('A').fontBoundingBoxDescent === 0;
+
+    @assert ctx.measureText('ABCD').fontBoundingBoxAscent === 30;
+    @assert ctx.measureText('ABCD').fontBoundingBoxDescent === 0;
+  variants: *load-font-variant-definition
+
 - name: 2d.text.measure.emHeights
   desc: Testing emHeights
   test_type: promise
@@ -1094,16 +1127,54 @@
   - CanvasTest
   code: |
     {{ load_font }}
-    ctx.font = '50px CanvasTest';
+    ctx.font = '40px CanvasTest';
     ctx.direction = 'ltr';
     ctx.align = 'left'
-    @assert ctx.measureText('A').emHeightAscent === 37.5;
-    @assert ctx.measureText('A').emHeightDescent === 12.5;
-    @assert ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent === 50;
+    @assert ctx.measureText('A').emHeightAscent === 30;
+    @assert ctx.measureText('A').emHeightDescent === 10;
+    @assert ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent === 40;
 
-    @assert ctx.measureText('ABCD').emHeightAscent === 37.5;
-    @assert ctx.measureText('ABCD').emHeightDescent === 12.5;
-    @assert ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent === 50;
+    @assert ctx.measureText('ABCD').emHeightAscent === 30;
+    @assert ctx.measureText('ABCD').emHeightDescent === 10;
+    @assert ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent === 40;
+  variants: *load-font-variant-definition
+
+- name: 2d.text.measure.emHeights-low-ascent
+  desc: Testing emHeights with reduced ascent metric
+  test_type: promise
+  fonts:
+  - CanvasTest-ascent256
+  code: |
+    {{ load_font }}
+    ctx.font = '40px CanvasTest-ascent256';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    @assert ctx.measureText('A').emHeightAscent === 20;
+    @assert ctx.measureText('A').emHeightDescent === 20;
+    @assert ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent === 40;
+
+    @assert ctx.measureText('ABCD').emHeightAscent === 20;
+    @assert ctx.measureText('ABCD').emHeightDescent === 20;
+    @assert ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent === 40;
+  variants: *load-font-variant-definition
+
+- name: 2d.text.measure.emHeights-zero-descent
+  desc: Testing emHeights with zero descent metric
+  test_type: promise
+  fonts:
+  - CanvasTest-descent0
+  code: |
+    {{ load_font }}
+    ctx.font = '40px CanvasTest-descent0';
+    ctx.direction = 'ltr';
+    ctx.align = 'left'
+    @assert ctx.measureText('A').emHeightAscent === 40;
+    @assert ctx.measureText('A').emHeightDescent === 0;
+    @assert ctx.measureText('A').emHeightDescent + ctx.measureText('A').emHeightAscent === 40;
+
+    @assert ctx.measureText('ABCD').emHeightAscent === 40;
+    @assert ctx.measureText('ABCD').emHeightDescent === 0;
+    @assert ctx.measureText('ABCD').emHeightDescent + ctx.measureText('ABCD').emHeightAscent === 40;
   variants: *load-font-variant-definition
 
 - name: 2d.text.measure.baselines
diff --git a/tests/wpt/tests/html/dom/render-blocking/document-render-blocking-partial.tentative.html b/tests/wpt/tests/html/dom/render-blocking/document-render-blocking-partial.tentative.html
new file mode 100644
index 00000000000..89ab05ed845
--- /dev/null
+++ b/tests/wpt/tests/html/dom/render-blocking/document-render-blocking-partial.tentative.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+  <html blocking=render>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/utils.js"></script>
+  <title>`blocking=render` defers frames until the attribute is set</title>
+  <script>
+    assert_implements(document.documentElement.blocking, "no blocking attribute");
+
+    promise_test(() => {
+      return new Promise((resolve, reject) => {
+        requestAnimationFrame(() => {
+          if (document.getElementById("last"))
+            reject();
+          else
+            resolve();
+        });
+      });
+    }, "blocking defers frames until removed");
+  </script>
+  </head>
+  <body>
+    <div id="first"></div>
+    <script>
+      jankMany(100, 10);
+      document.documentElement.blocking="";
+    </script>
+    <div id="second"></div>
+    <script>
+      jankMany(100, 10);
+    </script>
+    <div id="last"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/dom/render-blocking/document-render-blocking.tentative.html b/tests/wpt/tests/html/dom/render-blocking/document-render-blocking.tentative.html
new file mode 100644
index 00000000000..909029b73db
--- /dev/null
+++ b/tests/wpt/tests/html/dom/render-blocking/document-render-blocking.tentative.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+  <html blocking=render>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="support/utils.js"></script>
+  <title>`blocking=render` defers frames until complete document parsed</title>
+  <script>
+    assert_implements(document.documentElement.blocking, "no blocking attribute");
+
+    promise_test(() => {
+      return new Promise((resolve, reject) => {
+        requestAnimationFrame(() => {
+          if (document.getElementById("last"))
+            resolve();
+          else
+            reject();
+        });
+      });
+    }, "blocking defers frames until full parsing");
+  </script>
+  </head>
+  <body>
+    <div id="first"></div>
+    <script>
+      jankMany(100, 10);
+    </script>
+    <div id="second"></div>
+    <script>
+      jankMany(100, 10);
+    </script>
+    <div id="last"></div>
+  </body>
+</html>
diff --git a/tests/wpt/tests/html/dom/render-blocking/support/utils.js b/tests/wpt/tests/html/dom/render-blocking/support/utils.js
new file mode 100644
index 00000000000..9a890ab685c
--- /dev/null
+++ b/tests/wpt/tests/html/dom/render-blocking/support/utils.js
@@ -0,0 +1,10 @@
+function jank(ms) {
+  let start = performance.now();
+  while (performance.now() < start + ms);
+}
+
+function jankMany(ms, times) {
+  for (let i = 0; i < times; i++) {
+    jank(ms);
+  }
+}
diff --git a/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-named-attribute-detached-context-crash.html b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-named-attribute-detached-context-crash.html
new file mode 100644
index 00000000000..7445b49f0fe
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/embedded-content/the-embed-element/embed-named-attribute-detached-context-crash.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<body>
+<iframe id="i"></iframe>
+<script>
+let e = i.contentDocument.createElement("embed");
+i.contentDocument.body.appendChild(e);
+i.remove();
+
+// These should not crash.
+e.tryToGetAnAttribute;
+e.tryToSetAnAttribute = "foo";
+</script>
+</body>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html
new file mode 100644
index 00000000000..7cf2aff5159
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-ask-for-reset.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="en">
+<title>HTMLSelectListElement Test: ask-for-reset</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<form name="fm1" id="form1">
+  <selectlist id="selectlist1">
+    <option>one</option>
+    <option>two</option>
+  </selectlist>
+
+  <selectlist id="selectlist2">
+    <option>one</option>
+    <option selected>two</option>
+  </selectlist>
+
+  <selectlist id="selectlist3">
+    <option>one</option>
+    <option selected>two</option>
+    <option selected>three</option>
+  </selectlist>
+</form>
+
+<script>
+function createSelectList(numberOfOptions) {
+  let selectList = document.createElement("selectlist");
+  for (let i = 0; i < numberOfOptions; i++) {
+    let option = document.createElement("option");
+    option.value = i;
+    selectList.appendChild(option);
+  }
+  return selectList;
+}
+
+function checkSelection(selectList, selectedOptionIndex, msg) {
+  for (let i = 0; i < selectList.children.length; i++) {
+    if (i != selectedOptionIndex) {
+      assert_false(selectList.children[i].selected);
+    }
+  }
+  assert_true(selectList.children[selectedOptionIndex].selected, msg);
+  assert_equals(selectList.value, selectList.children[selectedOptionIndex].value);
+}
+
+test(() => {
+  let selectList = createSelectList(5);
+
+  selectList.children[4].selected = true;
+  checkSelection(selectList, 4);
+
+  selectList.children[4].remove();
+  checkSelection(selectList, 0, "After removing the selected option, selection should default to first option.");
+
+  selectList.children[3].selected = true;
+  checkSelection(selectList, 3);
+  selectList.children[0].remove();
+  checkSelection(selectList, 2, "Removing non-selected option should have no effect.");
+}, "ask-for-reset when removing option");
+
+test(() => {
+  let selectList = createSelectList(3);
+  selectList.children[1].selected = true;
+
+  let newOption = document.createElement("option");
+  newOption.selected = true;
+  selectList.appendChild(newOption);
+  checkSelection(selectList, 3, "Inserting a selected option should update selection.");
+
+  let newOption2 = document.createElement("option");
+  newOption2.selected = true;
+  selectList.prepend(newOption2);
+  checkSelection(selectList, 0, "Inserting a selected option should update selection, even though it's not last in tree order.");
+
+  let newOption3 = document.createElement("option");
+  selectList.appendChild(newOption3);
+  checkSelection(selectList, 0, "Inserting a non-selected option should have no effect.");
+}, "ask-for-reset when inserting option");
+
+test(() => {
+  let selectList = createSelectList(3);
+  let options = selectList.children;
+
+  // select options from first to last
+  for (let i = 0; i < options.length; i++) {
+    options[i].selected = true;
+    checkSelection(selectList, i);
+  }
+
+  // select options from last to first
+  for (let i = options.length - 1; i >= 0; i--) {
+    options[i].selected = true;
+    checkSelection(selectList, i);
+  }
+
+  options[2].selected = true;
+  checkSelection(selectList, 2);
+  options[2].selected = false;
+  checkSelection(selectList, 0, "First non-disabled option should be selected.");
+
+  options[0].disabled = true;
+  options[2].selected = true;
+  checkSelection(selectList, 2);
+  options[2].selected = false;
+  checkSelection(selectList, 1, "First non-disabled option should be selected.");
+}, "ask-for-reset when changing selectedness of option");
+
+test(() => {
+  let selectList1 = document.getElementById("selectlist1");
+  let selectList2 = document.getElementById("selectlist2");
+  let selectList3 = document.getElementById("selectlist3");
+
+  document.getElementById("form1").reset();
+
+  assert_equals(selectList1.value, "one", "First non-disabled option should be selected.");
+  assert_equals(selectList2.value, "two", "The selected option should be selected.");
+  assert_equals(selectList3.value, "three", "Last selected option should be selected.")
+}, "ask-for-reset for form");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-disabled.tentative.html
similarity index 72%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-disabled.tentative.html
index 0fe722fdfed..f557804d9bf 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-disabled.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-disabled.tentative.html
@@ -13,16 +13,16 @@ function OnFocus(event) {
 }
 </script>
 
-<selectmenu id="selectmenu" onfocus="OnFocus(event)" disabled>
+<selectlist id="selectlist" onfocus="OnFocus(event)" disabled>
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
 <script>
 promise_test(async () => {
-  const selectmenu = document.getElementById("selectmenu");
-  selectmenu.focus();
+  const selectlist = document.getElementById("selectlist");
+  selectlist.focus();
   assert_equals(focused_element_id, null);
-}, "Check that disabled <selectmenu> cannot be focused");
+}, "Check that disabled <selectlist> cannot be focused");
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-events.tentative.html
similarity index 55%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-events.tentative.html
index 830daaabc38..94577815cd0 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-events.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-events.tentative.html
@@ -1,59 +1,59 @@
 <!DOCTYPE html>
-<title>HTMLSelectMenuElement Test: events</title>
+<title>HTMLSelectListElement Test: events</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>
 
-<selectmenu id="selectMenu0">
+<selectlist id="selectList0">
   <div slot="button" behavior="button">
     <span behavior="selected-value"></span>
-    <button id="selectMenu0-button">selectMenu0-button</button>
+    <button id="selectList0-button">selectList0-button</button>
   </div>
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectMenu1">
+<selectlist id="selectList1">
   <option>one</option>
   <option>
     two
-    <button id="selectMenu1-button">selectMenu1-button</button>
+    <button id="selectList1-button">selectList1-button</button>
   </option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectMenu2">
+<selectlist id="selectList2">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectMenu3">
+<selectlist id="selectList3">
   <option>same</option>
   <option>same</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectMenu4">
+<selectlist id="selectList4">
   <option>one</option>
-  <option id="selectMenu4-option2">two</option>
-</selectmenu>
+  <option id="selectList4-option2">two</option>
+</selectlist>
 
-<selectmenu id="selectMenu5WithTabIndex" tabindex="1">
+<selectlist id="selectList5WithTabIndex" tabindex="1">
   <option>one</option>
   <option>two</option>
-</selectmenu>
+</selectlist>
 
 <input id="input6"/>
-<selectmenu id="selectMenu7">
-  <button slot="button" behavior="button" id="selectMenu7-button">
-    selectMenu7-button
+<selectlist id="selectList7">
+  <button slot="button" behavior="button" id="selectList7-button">
+    selectList7-button
   </button>
   <option>one</option>
   <option>two</option>
-</selectmenu>
+</selectlist>
 
 <script>
 
@@ -66,12 +66,12 @@
   }
 
   promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu0");
-    const selectMenuButton = document.getElementById("selectMenu0-button");
-    assert_false(selectMenu.open);
-    const selectMenuButtonPromise = new Promise(async resolve => {
-      selectMenuButton.addEventListener("click", (e) => {
-        assert_false(selectMenu.open, "Listbox shouldn't have opened yet");
+    const selectList = document.getElementById("selectList0");
+    const selectListButton = document.getElementById("selectList0-button");
+    assert_false(selectList.open);
+    const selectListButtonPromise = new Promise(async resolve => {
+      selectListButton.addEventListener("click", (e) => {
+        assert_false(selectList.open, "Listbox shouldn't have opened yet");
         // PreventDefaulting the event here should prevent UA controller code
         // on the button part from opening the listbox.
         e.preventDefault();
@@ -79,16 +79,16 @@
       });
     });
 
-    const selectMenuPromise = new Promise(async resolve => {
-      selectMenu.addEventListener("click", (e) => {
-        assert_true(e.defaultPrevented, "Event should have been defaultPrevented by selectMenuButton click handler");
-        assert_false(selectMenu.open, "Listbox shouldn't have opened, because click event was defaultPrevented.");
+    const selectListPromise = new Promise(async resolve => {
+      selectList.addEventListener("click", (e) => {
+        assert_true(e.defaultPrevented, "Event should have been defaultPrevented by selectListButton click handler");
+        assert_false(selectList.open, "Listbox shouldn't have opened, because click event was defaultPrevented.");
         resolve();
       });
     });
 
-    await clickOn(selectMenuButton);
-    return Promise.all([selectMenuButtonPromise, selectMenuPromise]);
+    await clickOn(selectListButton);
+    return Promise.all([selectListButtonPromise, selectListPromise]);
   }, "Button controller code should not run if the click event is preventDefaulted.");
 
   // See https://w3c.github.io/webdriver/#keyboard-actions
@@ -101,13 +101,13 @@
   };
 
   promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu1");
-    const selectMenuButton = document.getElementById("selectMenu1-button");
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open);
-    const selectMenuButtonPromise = new Promise(async resolve => {
-      selectMenuButton.addEventListener("click", (e) => {
-        assert_true(selectMenu.open, "Listbox shouldn't have closed yet");
+    const selectList = document.getElementById("selectList1");
+    const selectListButton = document.getElementById("selectList1-button");
+    await clickOn(selectList);
+    assert_true(selectList.open);
+    const selectListButtonPromise = new Promise(async resolve => {
+      selectListButton.addEventListener("click", (e) => {
+        assert_true(selectList.open, "Listbox shouldn't have closed yet");
         // PreventDefaulting the event here should prevent UA controller code
         // on the listbox part from selecting the option and closing the listbox.
         e.preventDefault();
@@ -115,143 +115,143 @@
       });
     });
 
-    const selectMenuPromise = new Promise(async resolve => {
-      selectMenu.addEventListener("click", (e) => {
-        assert_true(e.defaultPrevented, "Event should have been defaultPrevented by selectMenuButton click handler");
-        assert_true(selectMenu.open, "Listbox shouldn't have closed, because keydown event was defaultPrevented.");
-        assert_equals(selectMenu.value, "one", "<selectmenu> shouldn't have changed value, because keydown event was defaultPrevented.");
+    const selectListPromise = new Promise(async resolve => {
+      selectList.addEventListener("click", (e) => {
+        assert_true(e.defaultPrevented, "Event should have been defaultPrevented by selectListButton click handler");
+        assert_true(selectList.open, "Listbox shouldn't have closed, because keydown event was defaultPrevented.");
+        assert_equals(selectList.value, "one", "<selectlist> shouldn't have changed value, because keydown event was defaultPrevented.");
         resolve();
       });
     });
 
-    await clickOn(selectMenuButton);
-    return Promise.all([selectMenuButtonPromise, selectMenuPromise]);
+    await clickOn(selectListButton);
+    return Promise.all([selectListButtonPromise, selectListPromise]);
   }, "Listbox controller code should not run if the click event is preventDefaulted.");
 
   promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu2");
+    const selectList = document.getElementById("selectList2");
     let input_event_count = 0;
     let change_event_count = 0;
 
-    selectMenu.addEventListener("input", (e) => {
+    selectList.addEventListener("input", (e) => {
       assert_true(e.composed, "input event should be composed");
       assert_equals(input_event_count, 0, "input event should not fire twice");
       assert_equals(change_event_count, 0, "input event should not fire before change");
       input_event_count++;
     });
-    selectMenu.addEventListener("change", (e) => {
+    selectList.addEventListener("change", (e) => {
       assert_false(e.composed, "change event should not be composed");
       assert_equals(input_event_count, 1, "change event should fire after input");
       assert_equals(change_event_count, 0, "change event should not fire twice");
       change_event_count++;
     });
 
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open);
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-    assert_false(selectMenu.open);
-    assert_equals(selectMenu.value, "one");
+    await clickOn(selectList);
+    assert_true(selectList.open);
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+    assert_false(selectList.open);
+    assert_equals(selectList.value, "one");
     assert_equals(input_event_count, 0, "input event shouldn't fire if value wasn't changed");
     assert_equals(change_event_count, 0, "change event shouldn't fire if value wasn't changed");
 
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open);
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
-    assert_equals(selectMenu.value, "two", "value should change when user switches options with arrow key");
+    await clickOn(selectList);
+    assert_true(selectList.open);
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowDown);
+    assert_equals(selectList.value, "two", "value should change when user switches options with arrow key");
     assert_equals(input_event_count, 1, "input event should fire when user switches options with arrow key");
     assert_equals(change_event_count, 0, "change event shouldn't fire until popover is closed");
 
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-    assert_equals(selectMenu.value, "two");
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+    assert_equals(selectList.value, "two");
     assert_equals(input_event_count, 1, "input event should have fired");
     assert_equals(change_event_count, 1, "change event should have fired");
-  }, "<selectmenu> should fire input and change events when new option is selected");
+  }, "<selectlist> should fire input and change events when new option is selected");
 
   promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu3");
+    const selectList = document.getElementById("selectList3");
     let input_event_count = 0;
     let change_event_count = 0;
 
-    selectMenu.addEventListener("input", (e) => {
+    selectList.addEventListener("input", (e) => {
       assert_true(e.composed, "input event should be composed");
       assert_equals(input_event_count, 0, "input event should not fire twice");
       assert_equals(change_event_count, 0, "input event should not fire before change");
       input_event_count++;
     });
-    selectMenu.addEventListener("change", (e) => {
+    selectList.addEventListener("change", (e) => {
       assert_false(e.composed, "change event should not be composed");
       assert_equals(input_event_count, 1, "change event should fire after input");
       assert_equals(change_event_count, 0, "change event should not fire twice");
       change_event_count++;
     });
 
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open);
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
+    await clickOn(selectList);
+    assert_true(selectList.open);
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowDown);
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
     assert_equals(input_event_count, 1, "input event should have fired");
     assert_equals(change_event_count, 1, "change event should have fired");
-  }, "<selectmenu> should fire input and change events even when new selected option has the same value as the old");
+  }, "<selectlist> should fire input and change events even when new selected option has the same value as the old");
 
   promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu4");
-    const selectMenuOption2 = document.getElementById("selectMenu4-option2");
+    const selectList = document.getElementById("selectList4");
+    const selectListOption2 = document.getElementById("selectList4-option2");
     let input_event_count = 0;
     let change_event_count = 0;
 
-    selectMenu.addEventListener("input", (e) => {
+    selectList.addEventListener("input", (e) => {
       assert_true(e.composed, "input event should be composed");
       assert_equals(input_event_count, 0, "input event should not fire twice");
       assert_equals(change_event_count, 0, "input event should not fire before change");
       input_event_count++;
     });
 
-    selectMenu.addEventListener("change", (e) => {
+    selectList.addEventListener("change", (e) => {
       assert_false(e.composed, "change event should not be composed");
       assert_equals(input_event_count, 1, "change event should fire after input");
       assert_equals(change_event_count, 0, "change event should not fire twice");
       change_event_count++;
     });
 
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open);
-    await clickOn(selectMenuOption2);
+    await clickOn(selectList);
+    assert_true(selectList.open);
+    await clickOn(selectListOption2);
     assert_equals(input_event_count, 1, "input event shouldn't fire when selected option didn't change");
     assert_equals(change_event_count, 1, "change event shouldn't fire when selected option didn't change");
-  }, "<selectmenu> should fire input and change events when option in listbox is clicked");
+  }, "<selectlist> should fire input and change events when option in listbox is clicked");
 
   promise_test(async() => {
-    const selectMenu = document.getElementById("selectMenu2");
-    await test_driver.send_keys(selectMenu, " ");
-    assert_true(selectMenu.open, "<Space> should open selectmenu");
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-    assert_false(selectMenu.open, "<Enter> should close selectmenu");
-  }, "Check that <Space> opens <selectmenu>.");
+    const selectList = document.getElementById("selectList2");
+    await test_driver.send_keys(selectList, " ");
+    assert_true(selectList.open, "<Space> should open selectlist");
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+    assert_false(selectList.open, "<Enter> should close selectlist");
+  }, "Check that <Space> opens <selectlist>.");
 
   promise_test(async() => {
-    const selectMenu = document.getElementById("selectMenu5WithTabIndex");
-    await test_driver.send_keys(selectMenu, " ");
-    assert_true(selectMenu.open, "<Space> should open selectmenu");
-    await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-    assert_false(selectMenu.open, "<Enter> should close selectmenu");
-  }, "Check that <Space> opens <selectmenu> when <selectmenu> specifies tabindex");
+    const selectList = document.getElementById("selectList5WithTabIndex");
+    await test_driver.send_keys(selectList, " ");
+    assert_true(selectList.open, "<Space> should open selectlist");
+    await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+    assert_false(selectList.open, "<Enter> should close selectlist");
+  }, "Check that <Space> opens <selectlist> when <selectlist> specifies tabindex");
 
   promise_test(async() => {
     const input6 = document.getElementById("input6");
-    const selectMenu = document.getElementById("selectMenu7");
-    const selectMenuButton = document.getElementById("selectMenu7-button")
+    const selectList = document.getElementById("selectList7");
+    const selectListButton = document.getElementById("selectList7-button")
 
     var keydown_count = 0;
-    selectMenuButton.addEventListener("keydown", (e) => {
+    selectListButton.addEventListener("keydown", (e) => {
       keydown_count++;
     });
 
-    // Focus selectmenu via Tab traversal because focus() does not work when selectmenu
+    // Focus selectlist via Tab traversal because focus() does not work when selectlist
     // has custom slot.
     // TODO(http://crbug.com/1440573) Fix this.
     await test_driver.send_keys(input6, KEY_CODE_MAP.Tab);
 
-    await test_driver.send_keys(selectMenu, "a");
+    await test_driver.send_keys(selectList, "a");
     assert_equals(keydown_count, 1, "button in shadowroot should have observed keydown");
-}, "Test that <selectmenu> button slot receives key events.");
+}, "Test that <selectlist> button slot receives key events.");
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html
new file mode 100644
index 00000000000..3e967d03ed0
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size-ref.tentative.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('option');
+  document.body.appendChild(selectlist);
+  selectlist.style.width = "400px";
+  selectlist.style.height = "50px";
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html
new file mode 100644
index 00000000000..d9e52a9fff7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-explicit-size.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!-- Tests that selectlist respects explicit size -->
+<link rel=author href="mailto:pkotwicz@chromium.org">
+<link rel="match" href="selectlist-explicit-size-ref.tentative.html">
+
+<style>
+selectlist {
+  width:400px;
+  height:50px;
+}
+</style>
+<selectlist>
+  <option>option</option>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size-ref.tentative.html
new file mode 100644
index 00000000000..46d6dbdb9b2
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size-ref.tentative.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('option');
+  document.body.appendChild(selectlist);
+  selectlist.style.fontSize = "48px";
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html
new file mode 100644
index 00000000000..9c30e71bda3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-font-size.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<!-- Tests that selectlist respects explicit size -->
+<link rel=author href="mailto:pkotwicz@chromium.org">
+<link rel="match" href="selectlist-font-size-ref.tentative.html">
+
+<style>
+selectlist {
+  font-size:48px;
+}
+</style>
+<selectlist>
+  <option>option</option>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-attribute.tentative.html
similarity index 98%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-attribute.tentative.html
index 16ee1b80456..c1872b93039 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-attribute.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-attribute.tentative.html
@@ -1,4 +1,4 @@
-<!-- This test is tentative until the <selectmenu> gets adopted by standards. When that happens,
+<!-- This test is tentative until the <selectlist> gets adopted by standards. When that happens,
      this test can be folded back into these tests:
         html/semantics/forms/form-control-infrastructure/form_attribute.html
         html/semantics/forms/form-control-infrastructure/form.html -->
@@ -49,7 +49,7 @@
 
     <script>
       var reassociateableElements = [
-        "selectmenu",
+        "selectlist",
       ];
 
       var form1 = null;
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-elements.tentative.html
similarity index 68%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-elements.tentative.html
index eed098256ca..07e5be6ef4f 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-elements.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-elements.tentative.html
@@ -1,25 +1,25 @@
 <!DOCTYPE html>
 <html lang="en">
-<title>HTMLSelectMenuElement Test: form.elements</title>
+<title>HTMLSelectListElement Test: form.elements</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>
 
 <form id="form0">
-<selectmenu id="selectmenu0">
+<selectlist id="selectlist0">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 <form>
 
 <script>
 promise_test(async t => {
   // TODO: Move test to /the-form-element/form-elements-filter.html once
-  // <selectmenu> becomes part of the HTML spec.
+  // <selectlist> becomes part of the HTML spec.
   const formElements = document.querySelector("#form0").elements;
   assert_equals(formElements.length, 1);
-  assert_equals(formElements[0].id, "selectmenu0");
-}, "Check that <selectmenu> is exposed in form.elements");
+  assert_equals(formElements[0].id, "selectlist0");
+}, "Check that <selectlist> is exposed in form.elements");
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-state-restore.tentative.html
similarity index 76%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-state-restore.tentative.html
index 1002355a5ab..f98494a9507 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-state-restore.tentative.html
@@ -1,37 +1,37 @@
 <!DOCTYPE html>
 <html lang="en">
-<title>HTMLSelectMenuElement Test: form state restore</title>
+<title>HTMLSelectListElement Test: form state restore</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <input id="emptyOnFirstVisit">
 <form action="support/back.html" id="form0">
-<selectmenu id="selectmenu0">
+<selectlist id="selectlist0">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 </form>
 
 <script>
 async_test(t => {
   window.onload = () => t.step_timeout(() => {
     let state = document.getElementById('emptyOnFirstVisit');
-    let selectMenu = document.getElementById("selectmenu0");
+    let selectList = document.getElementById("selectlist0");
 
     if (!state.value) {
       // First visit.
       t.step_timeout(() => {
         state.value = 'visited';
-        assert_equals(selectMenu.value, "one");
-        selectMenu.value = "two";
+        assert_equals(selectList.value, "one");
+        selectList.value = "two";
         // The form is submitted in a timeout to make sure that a new back/forward list item is created.
         document.getElementById('form0').submit();
       }, 0);
     } else {
       // Went back to this page again, and the form state should be restored.
-      assert_equals(selectMenu.value, "two");
+      assert_equals(selectList.value, "two");
       t.done();
     }
   }, 1);
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html
similarity index 68%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html
index 75a2b17e903..4b5e4970287 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-form-submission.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-form-submission.tentative.html
@@ -1,33 +1,33 @@
 <!DOCTYPE html>
 <html lang="en">
-<title>HTMLSelectMenuElement Test: form submission</title>
+<title>HTMLSelectListElement Test: form submission</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <form id="form0">
-  <selectmenu name="s0" id="selectmenu0">
+  <selectlist name="s0" id="selectlist0">
     <option selected>one</option>
     <option>two</option>
     <option>three</option>
-  </selectmenu>
+  </selectlist>
 </form>
 
 <form id="form1">
   <input type="text" name="i1" value="test">
-  <selectmenu id="selectmenu1">
+  <selectlist id="selectlist1">
     <option selected>one</option>
     <option>two</option>
     <option>three</option>
-  </selectmenu>
+  </selectlist>
 </form>
 
 <script>
 
 test(() => {
   const form0 = document.getElementById("form0");
-  const selectMenu0 = document.getElementById("selectmenu0");
-  assert_equals(selectMenu0.value, "one");
+  const selectList0 = document.getElementById("selectlist0");
+  assert_equals(selectList0.value, "one");
 
   const formData = new FormData(form0);
   let entries = 0;
@@ -37,12 +37,12 @@ test(() => {
     entries++;
   }
   assert_equals(entries, 1);
-}, "Test that HTMLSelectMenu.value is used for form submission");
+}, "Test that HTMLSelectList.value is used for form submission");
 
 test(() => {
   const form1 = document.getElementById("form1");
-  const selectMenu1 = document.getElementById("selectmenu1");
-  assert_equals(selectMenu1.value, "one");
+  const selectList1 = document.getElementById("selectlist1");
+  assert_equals(selectList1.value, "one");
 
   const formData = new FormData(form1);
   let entries = 0;
@@ -52,6 +52,6 @@ test(() => {
     entries++;
   }
   assert_equals(entries, 1);
-}, "Test that HTMLSelectMenu.value is not used for form submission without name attribute");
+}, "Test that HTMLSelectList.value is not used for form submission without name attribute");
 
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-keyboard.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-keyboard.tentative.html
new file mode 100644
index 00000000000..38c5fd7dc4e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-keyboard.tentative.html
@@ -0,0 +1,123 @@
+<!doctype html>
+<title>HTMLSelectListElement Test: keyboard accessibility</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>
+  <selectlist id="selectList0">
+    <div id="selectList0-button0" slot="button" behavior="button" tabindex="0">button</div>
+    <option>one</option>
+    <option>two</option>
+    <option>three</option>
+  </selectlist>
+
+  <selectlist id="selectList1">
+    <option id="selectList1-child0">one</option>
+  </selectlist>
+
+  <selectlist id="selectList2" disabled>
+    <div id="selectList2-button0" slot="button" behavior="button" tabindex="0">button</div>
+    <option disabled>one</option>
+    <option>two</option>
+    <option>three</option>
+  </selectlist>
+
+  <selectlist id="selectList3">
+    <div id="selectList3-button0" slot="button" behavior="button" tabindex="0">button</div>
+    <option>one</option>
+    <option disabled>two</option>
+    <option>three</option>
+  </selectlist>
+<script>
+// See https://w3c.github.io/webdriver/#keyboard-actions
+const KEY_CODE_MAP = {
+  'Enter':      '\uE007',
+  'Space':      '\uE00D',
+  'ArrowUp':    '\uE013',
+  'ArrowDown':  '\uE015'
+};
+
+function clickOn(element) {
+    const actions = new test_driver.Actions();
+    return actions.pointerMove(0, 0, {origin: element})
+      .pointerDown({button: actions.ButtonType.LEFT})
+      .pointerUp({button: actions.ButtonType.LEFT})
+      .send();
+  }
+
+promise_test(async t => {
+  const selectList = document.querySelector("#selectList0");
+  const button = document.querySelector("#selectList0-button0");
+  assert_false(selectList.open, "selectlist should not be initially open");
+
+  await test_driver.send_keys(button, KEY_CODE_MAP.Enter);
+  assert_true(selectList.open, "Enter key should open selectlist");
+  assert_equals(selectList.value, "one");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowDown);
+  assert_equals(selectList.value, "two", "Down arrow should go to next option");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowDown);
+  assert_equals(selectList.value, "three", "Down arrow should go to next option");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowDown);
+  assert_equals(selectList.value, "three", "Down arrow should do nothing if already at the last option");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowUp);
+  assert_equals(selectList.value, "two", "Up arrow should go to the previous option");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowUp);
+  assert_equals(selectList.value, "one", "Up arrow should go to the previous option");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.ArrowUp);
+  assert_equals(selectList.value, "one", "Up arrow should do nothing if already at the first option");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+  assert_false(selectList.open, "Enter key should close selectlist");
+
+  await test_driver.send_keys(selectList, " ");
+  assert_true(selectList.open, "Space key should open selectlist");
+
+  // This behavior is suspicious (since Space key can open the selectlist),
+  // but it maches <select>. See https://github.com/openui/open-ui/issues/386
+  await test_driver.send_keys(selectList, " ");
+  assert_true(selectList.open, "Space key should *not* close selectlist");
+
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+  assert_false(selectList.open, "Enter key should close selectlist");
+}, "Validate Enter, Up/Down Arrow, and Space keyboard accessibility support for <selectlist>");
+
+promise_test(async t => {
+  const selectListOption = document.getElementById("selectList1-child0");
+  const event = document.createEvent("Event");
+  event.initEvent("keydown");
+  selectListOption.dispatchEvent(event);
+}, "Firing a synthetic event at a selectlist's option doesn't crash");
+
+promise_test(async t => {
+  const selectList2 = document.querySelector("#selectList2");
+  const selectList2Button = document.querySelector("#selectList2-button0");
+  assert_false(selectList2.open, "selectlist should not be initially open");
+
+  await test_driver.send_keys(selectList2Button, KEY_CODE_MAP.Enter);
+  assert_false(selectList2.open, "Enter key should not open a disabled selectlist");
+  await clickOn(selectList2);
+  assert_false(selectList2.open, "Click should not open a disabled selectlist");
+  assert_equals(selectList2.value, "one");
+
+  const selectList3 = document.querySelector("#selectList3");
+  const selectList3Button = document.querySelector("#selectList3-button0");
+  assert_false(selectList3.open, "selectlist should not be initially open");
+
+  await test_driver.send_keys(selectList3Button, KEY_CODE_MAP.Enter);
+  assert_true(selectList3.open, "Enter key should open selectlist");
+  assert_equals(selectList3.value, "one");
+
+  await test_driver.send_keys(selectList3, KEY_CODE_MAP.ArrowDown);
+  assert_equals(selectList3.value, "three", "Down arrow should go to next non-disabled option");
+
+  await test_driver.send_keys(selectList3, KEY_CODE_MAP.ArrowUp);
+  assert_equals(selectList3.value, "one", "Up arrow should go to the previous non-disabled option");
+}, "Validate Enter, Up/Down Arrow keyboard accessibility support for disabled <selectlist>");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html
new file mode 100644
index 00000000000..819da49fdd4
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-labels.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<title>HTMLSelectListElement Test: labels</title>
+<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<label id="label1" for="selectlist1">Label 1</label>
+<selectlist id="selectlist1">
+  <option>one</option>
+  <option>two</option>
+  <option>three</option>
+  <option>four</option>
+</selectlist>
+<label id="label2" for="selectlist1">Label 2</label>
+<label id="label3" for="invalid-selectlist1">Label 3</label>
+
+<script>
+
+test(() => {
+  let selectList = document.getElementById("selectlist1");
+
+  assert_true(selectList.labels instanceof NodeList);
+  assert_equals(selectList.labels.length, 2);
+  assert_equals(selectList.labels[0], document.getElementById("label1"));
+  assert_equals(selectList.labels[1], document.getElementById("label2"));
+}, "Validate selectlist.labels");
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-fallback-change-crash.tentative.html
similarity index 77%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-fallback-change-crash.tentative.html
index 690a98dcf32..1a9e81d8178 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-listbox-fallback-change-crash.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-listbox-fallback-change-crash.tentative.html
@@ -3,19 +3,19 @@
 <link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1400522">
 <link rel="author" href="mailto:xiaochengh@chromium.org">
 
-<selectmenu id="selectMenu" style="position: absolute;">
+<selectlist id="selectList" style="position: absolute;">
     <div slot="button">
         <button id="b1" behavior="button"></button>
     </div>
-    <selectmenu>
+    <selectlist>
         <div slot="button">
             <button id="b2" behavior="button">x</button>
         </div>
         <div id="listbox" popover slot="listbox" behavior="listbox">
             <option>y</option>
         </div>
-    </selectmenu>
-</selectmenu>
+    </selectlist>
+</selectlist>
 
 <script type="module">
     const raf = () => new Promise(resolve => requestAnimationFrame(resolve));
@@ -23,12 +23,12 @@
     document.querySelector('#b1').click();
     document.querySelector('#b2').click();
 
-    document.querySelector('#selectMenu').style.top = '-25px';
+    document.querySelector('#selectList').style.top = '-25px';
 
     await raf();
     await raf();
 
-    document.querySelector('#selectMenu').style.top = '0px';
+    document.querySelector('#selectList').style.top = '0px';
 
     document.documentElement.classList.remove('test-wait');
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-many-options.tentative.html
similarity index 82%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-many-options.tentative.html
index b828326197b..36bae1a82ba 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-many-options.tentative.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<title>HTMLSelectMenuElement Test: many options</title>
+<title>HTMLSelectListElement Test: many options</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -9,13 +9,13 @@
 <script src="/resources/testdriver-vendor.js"></script>
 
 <style>
-  #selectMenu0 {
+  #selectList0 {
     position: absolute;
     top: 0px;
     left: 0px;
   }
 
-  #selectMenu0-popover {
+  #selectList0-popover {
     border: 1px solid rgba(0, 0, 0, 0.15);
     border-radius: 4px;
     box-shadow: 0px 12.8px 28.8px rgba(0, 0, 0, 0.13), 0px 0px 9.2px rgba(0, 0, 0, 0.11);
@@ -25,8 +25,8 @@
   }
 </style>
 
-<selectmenu id="selectMenu0">
-  <div popover slot="listbox" behavior="listbox" id="selectMenu0-popover">
+<selectlist id="selectList0">
+  <div popover slot="listbox" behavior="listbox" id="selectList0-popover">
     <option>bottom left</option>
     <option>two</option>
     <option>three</option>
@@ -115,7 +115,7 @@
     <option>two</option>
     <option>three</option>
   </div>
-</selectmenu>
+</selectlist>
 <br>
 
 <script>
@@ -128,13 +128,13 @@
   }
 
   promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
-    const selectMenu0Popover = document.getElementById("selectMenu0-popover");
+    const selectList0 = document.getElementById("selectList0");
+    const selectList0Popover = document.getElementById("selectList0-popover");
 
-    await clickOn(selectMenu0);
-    assert_equals(Math.round(selectMenu0.getBoundingClientRect().bottom), Math.round(selectMenu0Popover.getBoundingClientRect().top));
-    assert_equals(Math.round(selectMenu0.getBoundingClientRect().left), Math.round(selectMenu0Popover.getBoundingClientRect().left));
-    assert_equals(window.innerHeight, Math.round(selectMenu0Popover.getBoundingClientRect().bottom));
+    await clickOn(selectList0);
+    assert_equals(Math.round(selectList0.getBoundingClientRect().bottom), Math.round(selectList0Popover.getBoundingClientRect().top));
+    assert_equals(Math.round(selectList0.getBoundingClientRect().left), Math.round(selectList0Popover.getBoundingClientRect().left));
+    assert_equals(window.innerHeight, Math.round(selectList0Popover.getBoundingClientRect().bottom));
   }, "The popover should be bottom left positioned");
 
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned-ref.tentative.html
similarity index 74%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned-ref.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned-ref.tentative.html
index 5985df5936b..b1df8a65816 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned-ref.tentative.html
@@ -5,15 +5,15 @@ div {
   display:flex;
   justify-content:flex-end;
 }
-selectmenu {
+selectlist {
   width:100px;
 }
-selectmenu::part(button) {
+selectlist::part(button) {
   border-style:none;
   background-color:rgba(0,0,0,0)
 }
 </style>
 <div>
-<selectmenu>
+<selectlist>
   <option></option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned.tentative.html
similarity index 58%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned.tentative.html
index a419108e3d2..c2540acb368 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-end-aligned.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-end-aligned.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<!-- Tests that <selectmenu> marker is end-aligned -->
+<!-- Tests that <selectlist> marker is end-aligned -->
 <link rel=author href="mailto:pkotwicz@chromium.org">
-<link rel="match" href="selectmenu-marker-end-aligned-ref.tentative.html">
+<link rel="match" href="selectlist-marker-end-aligned-ref.tentative.html">
 
 <style>
 div {
@@ -9,15 +9,15 @@ div {
   display:flex;
   justify-content:flex-end;
 }
-selectmenu {
+selectlist {
   width:200px;
 }
-selectmenu::part(button) {
+selectlist::part(button) {
   border-style:none;
   background-color:rgba(0,0,0,0)
 }
 </style>
 <div>
-<selectmenu>
+<selectlist>
   <option></option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part-ref.html
new file mode 100644
index 00000000000..1a1302b96db
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('hello world');
+  document.body.appendChild(selectlist);
+  selectlist.querySelector('.fake-selectlist-internal-selectlist-button-icon')
+    .style.backgroundColor = 'red';
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html
similarity index 56%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html
index b6e94c947a4..dedabc9bab7 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-part.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
-<link rel=match href="selectmenu-marker-part-ref.html">
+<link rel=match href="selectlist-marker-part-ref.html">
 
 <style>
-selectmenu::part(marker) {
+selectlist::part(marker) {
   background-color: red;
 }
 </style>
-<selectmenu>
+<selectlist>
   <option>hello world</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot-ref.html
new file mode 100644
index 00000000000..e910df4c5ab
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('hello world');
+  document.body.appendChild(selectlist);
+
+  const oldMarker = selectlist.querySelector('.fake-selectlist-internal-selectlist-button-icon');
+  const newMarker = document.createElement('div');
+  newMarker.textContent = 'marker';
+
+  replaceChildElement(newMarker, oldMarker);
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html
similarity index 61%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html
index fff911005d8..de43a02c33f 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-slot.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
-<link rel=match href="selectmenu-marker-slot-ref.html">
+<link rel=match href="selectlist-marker-slot-ref.html">
 
-<selectmenu>
+<selectlist>
   <div slot=marker>marker</div>
   <option>hello world</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow-ref.tentative.html
similarity index 67%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow-ref.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow-ref.tentative.html
index 674de192e4c..dda53db5bf8 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow-ref.tentative.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <style>
-selectmenu {
+selectlist {
   width:100px;
 }
 </style>
 <div>
-<selectmenu>
+<selectlist>
   <option>&nbsp;</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow.tentative.html
similarity index 59%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow.tentative.html
index 6d39f6f3c50..345c2059837 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-visible-overflow.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-marker-visible-overflow.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
-<!-- Tests that the marker is visible when the <selectmenu> contains more text than it can show -->
+<!-- Tests that the marker is visible when the <selectlist> contains more text than it can show -->
 <link rel=author href="mailto:pkotwicz@chromium.org">
-<link rel="match" href="selectmenu-marker-visible-overflow-ref.tentative.html">
+<link rel="match" href="selectlist-marker-visible-overflow-ref.tentative.html">
 
 <style>
-selectmenu {
+selectlist {
   width:100px;
 }
 </style>
 <div>
-<selectmenu>
+<selectlist>
   <option>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-nested.tentative.html
similarity index 52%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-nested.tentative.html
index 06b4fb6eb24..1d15fb90160 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-nested.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-nested.tentative.html
@@ -1,23 +1,23 @@
 <!DOCTYPE html>
 <html lang="en">
-<title>HTMLSelectMenuElement Test: nested selects</title>
+<title>HTMLSelectListElement Test: nested selects</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>
 
-<selectmenu id="selectMenu0">
+<selectlist id="selectList0">
   <div popover slot="listbox" behavior="listbox">
-    <selectmenu id="nested0">
+    <selectlist id="nested0">
       <option id="child1">one</option>
       <option id="child2">two</option>
-    </selectmenu>
+    </selectlist>
     <option id="child3">three</option>
   </div>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectMenu1">
+<selectlist id="selectList1">
   <div popover slot="listbox" behavior="listbox">
     <select>
       <option>one</option>
@@ -25,18 +25,18 @@
     </select>
     <option>three</option>
   </div>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectMenu2">
+<selectlist id="selectList2">
   <div slot="button">
-    <selectmenu id="nested2">
-      <div slot="button" behavior="button" id="selectMenu2-button0">button0</div>
+    <selectlist id="nested2">
+      <div slot="button" behavior="button" id="selectList2-button0">button0</div>
       <option id="nested2-option1">one</option>
-    </selectmenu>
-    <div behavior="button" id="selectMenu2-button1">button1</div>
+    </selectlist>
+    <div behavior="button" id="selectList2-button1">button1</div>
   </div>
   <option>two</option>
-</selectmenu>
+</selectlist>
 
 <script>
   function clickOn(element) {
@@ -48,12 +48,12 @@
   }
 
   promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
+    const selectList0 = document.getElementById("selectList0");
     const nested0 = document.getElementById("nested0");
     const child2 = document.getElementById("child2");
-    assert_equals(selectMenu0.value, "three", "Options nested in another <selectmenu> should not get controller code from outer <selectmenu>");
-    await clickOn(selectMenu0);
-    assert_true(selectMenu0.open);
+    assert_equals(selectList0.value, "three", "Options nested in another <selectlist> should not get controller code from outer <selectlist>");
+    await clickOn(selectList0);
+    assert_true(selectList0.open);
     assert_false(nested0.open);
 
     await clickOn(nested0);
@@ -62,33 +62,33 @@
     await clickOn(child2);
     assert_false(nested0.open);
     assert_equals(nested0.value, "two");
-    assert_true(selectMenu0.open, "click on option in inner <selectmenu> should not close outer <selectmenu>");
-    assert_equals(selectMenu0.value, "three", "click on option in inner <selectmenu> should not change value of outer <selectmenu>");
-  }, "A <selectmenu> shouldn't apply controller code to parts nested in a <selectmenu> child");
+    assert_true(selectList0.open, "click on option in inner <selectlist> should not close outer <selectlist>");
+    assert_equals(selectList0.value, "three", "click on option in inner <selectlist> should not change value of outer <selectlist>");
+  }, "A <selectlist> shouldn't apply controller code to parts nested in a <selectlist> child");
 
   promise_test(async () => {
-    const selectMenu1 = document.getElementById("selectMenu1");
-    assert_equals(selectMenu0.value, "three");
-  }, "A <selectmenu> shouldn't apply controller code to parts nested in a <select> child");
+    const selectList1 = document.getElementById("selectList1");
+    assert_equals(selectList0.value, "three");
+  }, "A <selectlist> shouldn't apply controller code to parts nested in a <select> child");
 
   promise_test(async () => {
-    const selectMenu2 = document.getElementById("selectMenu2");
+    const selectList2 = document.getElementById("selectList2");
     const nested2 = document.getElementById("nested2");
-    const button0 = document.getElementById("selectMenu2-button0");
-    const button1 = document.getElementById("selectMenu2-button1");
+    const button0 = document.getElementById("selectList2-button0");
+    const button1 = document.getElementById("selectList2-button1");
     const nested2Option1 = document.getElementById("nested2-option1");
-    assert_false(selectMenu2.open);
+    assert_false(selectList2.open);
     assert_false(nested2.open);
 
     await clickOn(button0);
-    assert_false(selectMenu2.open, "Clicking the button of a nested <selectmenu> should not open the outer <selectmenu>");
-    assert_true(nested2.open, "Clicking the button of a nested <selectmenu> should open the outer <selectmenu>");
+    assert_false(selectList2.open, "Clicking the button of a nested <selectlist> should not open the outer <selectlist>");
+    assert_true(nested2.open, "Clicking the button of a nested <selectlist> should open the outer <selectlist>");
 
     await clickOn(nested2Option1);
     assert_false(nested2.open);
 
     await clickOn(button1);
-    assert_true(selectMenu2.open);
+    assert_true(selectList2.open);
     assert_false(nested2.open);
-  }, "A nested button part in a nested <selectmenu> shouldn't get controller code even if it comes first in document order");
+  }, "A nested button part in a nested <selectlist> shouldn't get controller code even if it comes first in document order");
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed-ref.tentative.html
similarity index 92%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed-ref.tentative.html
index c890bb63f1b..61b1c1a7108 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed-ref.tentative.html
@@ -3,16 +3,16 @@
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
 <link rel="stylesheet" href="/fonts/ahem.css">
 
-<selectmenu id="selectMenu0">
+<selectlist id="selectList0">
   <option>option with image displayed</option>
-</selectmenu>
+</selectlist>
 <div id=fakelistbox>
   option with image displayed
   <img src="/images/green-256x256.png">
 </div>
 
 <style>
-  html,selectmenu {
+  html,selectlist {
     font-family: Ahem;
   }
   #fakelistbox {
@@ -35,7 +35,7 @@
     padding: 4px;
   }
 
-  selectmenu {
+  selectlist {
     position: absolute;
     top: 0px;
     left: 0px;
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html
similarity index 82%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html
index 416f2dc2ac0..2d51002fb2e 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-displayed.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-displayed.tentative.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
 <html class="reftest-wait">
-<title>HTMLSelectMenuElement Test: option arbitrary content displayed</title>
+<title>HTMLSelectListElement Test: option arbitrary content displayed</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<link rel=match href="selectmenu-option-arbitrary-content-displayed-ref.tentative.html">
+<link rel=match href="selectlist-option-arbitrary-content-displayed-ref.tentative.html">
 <link rel="stylesheet" href="/fonts/ahem.css">
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 
 <style>
-  html,selectmenu {
+  html,selectlist {
     font-family: Ahem;
   }
-  selectmenu {
+  selectlist {
     position: absolute;
     top: 0px;
     left: 0px;
@@ -38,14 +38,14 @@
   }
 </style>
 
-<selectmenu id="selectMenu0">
+<selectlist id="selectList0">
   <div popover slot="listbox" behavior="listbox">
     <option>
       option with image displayed
       <img src="/images/green-256x256.png">
     </option>
   </div>
-</selectmenu>
+</selectlist>
 
 <script>
   function clickOn(element) {
@@ -57,9 +57,9 @@
   }
 
   async function test() {
-    const selectMenu0 = document.getElementById("selectMenu0");
+    const selectList0 = document.getElementById("selectList0");
 
-    await clickOn(selectMenu0);
+    await clickOn(selectList0);
     document.documentElement.classList.remove('reftest-wait');
   }
 
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed-ref.tentative.html
similarity index 89%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed-ref.tentative.html
index d12943105f8..fa44198fff0 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed-ref.tentative.html
@@ -6,8 +6,8 @@
   option with image not displayed
 </option>
 
-<selectmenu>
-</selectmenu>
+<selectlist>
+</selectlist>
 
 <option>
   option with image not displayed
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html
similarity index 57%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html
index 7bc936e7dc4..66b87ec33b9 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-arbitrary-content-not-displayed.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-arbitrary-content-not-displayed.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html>
-<title>HTMLSelectMenuElement Test: option arbitrary content not displayed</title>
+<title>HTMLSelectListElement Test: option arbitrary content not displayed</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<link rel=match href="selectmenu-option-arbitrary-content-not-displayed-ref.tentative.html">
+<link rel=match href="selectlist-option-arbitrary-content-not-displayed-ref.tentative.html">
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
@@ -12,17 +12,17 @@
   <img src="/images/green-256x256.png">
 </option>
 
-<selectmenu id="selectMenu0">
-  <option id="selectMenu0-option">
+<selectlist id="selectList0">
+  <option id="selectList0-option">
     option with image not displayed
     <img src="/images/green-256x256.png">
   </option>
-</selectmenu>
+</selectlist>
 
 <script>
-  const selectMenu0Option = document.getElementById("selectMenu0-option");
+  const selectList0Option = document.getElementById("selectList0-option");
 
-  // removing an option from <selectmenu> should revert back to its original display behavior
-  selectMenu0Option.remove();
-  document.body.append(selectMenu0Option);
+  // removing an option from <selectlist> should revert back to its original display behavior
+  selectList0Option.remove();
+  document.body.append(selectList0Option);
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-focusable.tentative.html
similarity index 65%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-focusable.tentative.html
index a78b972a2a7..993ef007e68 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-option-focusable.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-option-focusable.tentative.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-<title>HTMLSelectMenuElement Test: option facusable</title>
+<title>HTMLSelectListElement Test: option facusable</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -8,11 +8,11 @@
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 
-<selectmenu id="selectmenu0">
+<selectlist id="selectlist0">
   <option>one</option>
-  <option id="selectmenu0-option2">two</option>
+  <option id="selectlist0-option2">two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
 <script>
 // See https://w3c.github.io/webdriver/#keyboard-actions
@@ -32,18 +32,18 @@ function clickOn(element) {
 }
 
 promise_test(async t => {
-  const selectMenu = document.querySelector("#selectmenu0");
-  assert_false(selectMenu.open, "selectmenu should not be initially open");
+  const selectList = document.querySelector("#selectlist0");
+  assert_false(selectList.open, "selectlist should not be initially open");
 
-  await clickOn(selectMenu);
-  assert_true(selectMenu.open);
-  assert_equals(selectMenu.value, "one");
+  await clickOn(selectList);
+  assert_true(selectList.open);
+  assert_equals(selectList.value, "one");
 
-  const option2 = document.querySelector('#selectmenu0-option2');
+  const option2 = document.querySelector('#selectlist0-option2');
   option2.focus();
   assert_equals(document.activeElement, option2);
 
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-  assert_equals(selectMenu.value, "two");
-}, "Validate <option> is focusable when is a descendant of <selectmenu>");
+  await test_driver.send_keys(selectList, KEY_CODE_MAP.Enter);
+  assert_equals(selectList.value, "two");
+}, "Validate <option> is focusable when is a descendant of <selectlist>");
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-overflow-x-ref.tentative.html
similarity index 63%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x-ref.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-overflow-x-ref.tentative.html
index 8fd33dbc072..df87060359b 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x-ref.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-overflow-x-ref.tentative.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <style>
-selectmenu {
+selectlist {
   width:30px;
   height:20px;
 }
-selectmenu::part(button) {
+selectlist::part(button) {
   background-color:blue;
 }
 </style>
-<selectmenu>
+<selectlist>
   <option>&nbsp;</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-overflow-x.tentative.html
similarity index 56%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-overflow-x.tentative.html
index 0e0c3dba5e8..93c1b948a09 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-overflow-x.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-overflow-x.tentative.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
-<!-- Tests that selectmenu button part text is truncated by the button. -->
+<!-- Tests that selectlist button part text is truncated by the button. -->
 <link rel=author href="mailto:pkotwicz@chromium.org">
-<link rel="match" href="selectmenu-overflow-x-ref.tentative.html">
+<link rel="match" href="selectlist-overflow-x-ref.tentative.html">
 <style>
-selectmenu {
+selectlist {
   width:30px;
   height:20px;
 }
-selectmenu::part(button) {
+selectlist::part(button) {
   background-color:blue;
 }
 </style>
-<selectmenu>
+<selectlist>
   <option>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-parts-structure.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-parts-structure.tentative.html
new file mode 100644
index 00000000000..f60ba65be17
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-parts-structure.tentative.html
@@ -0,0 +1,530 @@
+<!DOCTYPE html>
+<html lang="en">
+<title>HTMLSelectListElement Test: part structure</title>
+<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
+<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>
+
+<selectlist id="selectList0">
+  <div popover slot="listbox" behavior="listbox">
+    <option id="selectList0-child1">one</option>
+    <option id="selectList0-child2">two</option>
+    <div behavior="option" id="selectList0-child3">three</div>
+  </div>
+  <option id="selectList0-child4">four</option>
+</selectlist>
+
+<selectlist id="selectList1">
+  <div popover slot="listbox" behavior="listbox" id="selectList1-popover">
+    <div behavior="button" id="selectList1-button">
+      Custom button
+    </div>
+    <option>one</option>
+    <option id="selectList1-child2">two</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList2">
+  <div slot="button" behavior="button" id="selectList2-button">
+    Custom button
+    <div popover behavior="listbox" id="selectList2-popover">
+      <option>one</option>
+      <option id="selectList2-child2">two</option>
+    </div>
+  </div>
+  <option>three</option>
+  <div>
+    This is some text.
+    <option id="selectList2-child4">four</option>
+    More text.
+  </div>
+</selectlist>
+
+<selectlist id="selectList3">
+  <div slot="button" id="selectList3-button-slot">
+    <div behavior="button" id="selectList3-button0">button0</div>
+  </div>
+  <option>one</option>
+</selectlist>
+
+<selectlist id="selectList4">
+  <div slot="button" behavior="button" id="selectList4-button0">button0</div>
+  <div slot="listbox" id="selectList4-listbox-slot">
+    <div popover behavior="listbox" id="selectList4-listbox0">
+      <option>one</option>
+      <option id="selectList4-option2">two</option>
+    </div>
+  </div>
+</selectlist>
+
+<selectlist id="selectList5">
+  <div slot="button" id="selectList5-button-slot">
+    <div behavior="button" id="selectList5-button0">button0</div>
+    <div behavior="selected-value" id="selectList5-selectedValue0"></div>
+  </div>
+  <option>one</option>
+  <option id="selectList5-option0">two</option>
+</selectlist>
+
+<!-- No associated JS test -- just don't crash when parsing! -->
+<selectlist id="selectList6">
+  <div slot="button"></div>
+  <div popover slot="listbox" behavior="listbox"></div>
+</selectlist>
+
+<!-- No associated JS test -- just don't crash when parsing! -->
+<selectlist id="selectList7">
+  <div slot="listbox"></div>
+  <div slot="button" behavior="button"></div>
+</selectlist>
+
+<!-- No associated JS test -- just don't crash when parsing! -->
+<selectlist id="selectList8">
+  <div slot="listbox"></div>
+  <option>one</option>
+</selectlist>
+
+<selectlist id="selectList9">
+  <div slot="listbox" id="selectList9-listbox-slot">
+    <div popover behavior="listbox" id="selectList9-originalListbox">
+      <option>one</option>
+      <option id="selectList9-option2">two</option>
+    </div>
+  </div>
+</selectlist>
+
+<selectlist id="selectList10">
+  <option slot="button" id="selectList10-slottedOption">Test 10</option>
+  <option>one</option>
+  <option id="selectList10-option2">two</option>
+</selectlist>
+
+<selectlist id="selectList11">
+  <div popover slot="listbox" behavior="listbox">
+    <option>one</option>
+  </div>
+  <div slot="button" behavior="listbox" id="selectList11-button">Test</div>
+</selectlist>
+
+<selectlist id="selectList12">
+  <div slot="button" id="selectList12-button-slot">
+    <div behavior="button" id="selectList12-button0">button0</div>
+  </div>
+  <div slot="listbox" id="selectList12-listbox-slot">
+    <div popover behavior="listbox" id="selectList12-originalListbox">
+      <option id="selectList12-option1">one</option>
+      <option>two</option>
+    </div>
+  </div>
+</selectlist>
+
+<selectlist id="selectList13">
+  <div slot="button" id="selectList12-button-slot">
+    <div id="selectList13-removeContent-button">
+      <div behavior="button" id="selectList13-button0">button0</div>
+      <div behavior="button" id="selectList13-button1">button1</div>
+    </div>
+    <div behavior="button" id="selectList13-button2">button2</div>
+  </div>
+  <div slot="listbox" id="selectList13-listbox-slot">
+    <div id="selectList13-removeContent-listbox">
+      <div popover behavior="listbox" id="selectList13-originalListbox">
+        <option id="selectList13-option1">one</option>
+        <option id="selectList13-option2">two</option>
+      </div>
+    </div>
+    <div popover behavior="listbox" id="selectList13-newListbox">
+      <option>three</option>
+      <option id="selectList13-option4">four</option>
+    </div>
+  </div>
+</selectlist>
+
+<selectlist id="selectList14">
+  <div slot="button" behavior="button" id="selectList14-button0">button0</div>
+  <option>one</option>
+  <option id="selectList14-option2">two</option>
+</selectlist>
+
+<selectlist id="selectList15">
+  <div slot="button" id="selectList15-div0"></div>
+  <option>one</option>
+</selectlist>
+
+<selectlist id="selectList16">
+  <div slot="button">
+    <div id="selectList16-div0">
+      <div behavior="button" id="selectList16-button0">button</div>
+    </div>
+  </div>
+  <option>one</option>
+</selectlist>
+
+<script>
+  function clickOn(element) {
+    const actions = new test_driver.Actions();
+    return actions.pointerMove(0, 0, {origin: element})
+      .pointerDown({button: actions.ButtonType.LEFT})
+      .pointerUp({button: actions.ButtonType.LEFT})
+      .send();
+  }
+
+  promise_test(async () => {
+    const selectList0 = document.getElementById("selectList0");
+    const selectList0Child1 = document.getElementById("selectList0-child1");
+    const selectList0Child2 = document.getElementById("selectList0-child2");
+    const selectList0Child3 = document.getElementById("selectList0-child3");
+    assert_equals(selectList0.value, "one");
+    await clickOn(selectList0);
+    await clickOn(selectList0Child2);
+    assert_equals(selectList0.value, "two");
+
+    await clickOn(selectList0);
+    await clickOn(selectList0Child3);
+    assert_equals(selectList0.value, "two", "Clicking a non-HTMLOptionElement labeled as an option should do nothing");
+
+    await clickOn(selectList0Child1);
+    assert_equals(selectList0.value, "one");
+    assert_false(selectList0.open);
+  }, "HTMLOptionElements (and not other element types) should receive option controller code");
+
+
+  promise_test(async () => {
+    const selectList0 = document.getElementById("selectList0");
+    const selectList0Child4 = document.getElementById("selectList0-child4");
+
+    assert_equals(selectList0.value, "one");
+    await clickOn(selectList0);
+    assert_true(selectList0.open);
+    selectList0Child4.click();
+    assert_equals(selectList0.value, "one", "Clicking an option outside of the popover should not change the value");
+  }, "To receive option part controller code, an option must be a descendant of the listbox part in a flat tree traversal");
+
+  promise_test(async () => {
+    const selectList1 = document.getElementById("selectList1");
+    const selectList1Popover = document.getElementById("selectList1-popover");
+    const selectList1Button = document.getElementById("selectList1-button");
+    const selectList1Child2 = document.getElementById("selectList1-child2");
+    assert_false(selectList1Popover.matches(':popover-open'));
+    selectList1Button.click();
+    assert_false(selectList1Popover.matches(':popover-open'), "Clicking a button part that is a descendant of the listbox part should have no effect");
+
+    assert_equals(selectList1.value, "one");
+    await clickOn(selectList1);
+    assert_true(selectList1Popover.matches(':popover-open'));
+    await clickOn(selectList1Child2);
+    assert_equals(selectList1.value, "two", "Clicking an <option> should change the value");
+  }, "To receive button part controller code, an element labeled as a button must not be a descendant of the listbox part in a flat tree traversal");
+
+  promise_test(async () => {
+    const selectList2 = document.getElementById("selectList2");
+    const selectList2Popover = document.getElementById("selectList2-popover");
+    const selectList2Button = document.getElementById("selectList2-button");
+    const selectList2Child2 = document.getElementById("selectList2-child2");
+    const selectList2Child4 = document.getElementById("selectList2-child4");
+
+    assert_false(selectList2Popover.matches(':popover-open'));
+    await clickOn(selectList2Button);
+    assert_false(selectList2Popover.matches(':popover-open'), "Clicking a button part should not show an invalid listbox part");
+
+    assert_equals(selectList2.value, "three");
+    await clickOn(selectList2Button);
+    await clickOn(selectList2Child4);
+    assert_equals(selectList2.value, "four", "Clicking an <option> that is a descendant of a valid listbox part should update the value");
+  }, "To receive listbox part controller code, an element labeled as a listbox must not be a descendant of the button part in a flat tree traversal");
+
+  promise_test(async () => {
+    const selectList3 = document.getElementById("selectList3");
+    const selectList3ButtonSlot = document.getElementById("selectList3-button-slot");
+    const selectList3Button0 = document.getElementById("selectList3-button0");
+
+    assert_false(selectList3.open);
+
+    let button1 = document.createElement("div");
+    button1.innerText = "button1";
+    button1.setAttribute("behavior", "button");
+    selectList3ButtonSlot.appendChild(button1);
+
+    await clickOn(button1);
+    assert_false(selectList3.open, "A button part should only get controller code if it's first in document order, even if added dynamically");
+
+    await clickOn(selectList3Button0);
+    assert_true(selectList3.open, "A button part should get controller code if it's first in document order");
+  }, "Button controller code should be applied in flat tree traversal order regardless of dynamic insertion order");
+
+  promise_test(async () => {
+    const selectList4 = document.getElementById("selectList4");
+    const selectList4Button0 = document.getElementById("selectList4-button0");
+    const selectList4ListboxSlot = document.getElementById("selectList4-listbox-slot");
+    const selectList4Option2 = document.getElementById("selectList4-option2");
+
+    assert_false(selectList4.open);
+
+    let listbox2 = document.createElement("div");
+    listbox2.innerHTML = `
+      <option>three</option>
+      <option id="selectList4-option4">four</option>
+    `;
+    listbox2.setAttribute("behavior", "listbox");
+    selectList4ListboxSlot.appendChild(listbox2);
+
+    await clickOn(selectList4Button0);
+    assert_true(selectList4.open);
+
+    const selectList4Option4 = document.getElementById("selectList4-option4");
+    await clickOn(selectList4Option4);
+    assert_equals(selectList3.value, "one", "An option in a listbox should not get controller code if its listbox isn't first in document order, even if added dynamically");
+
+    await clickOn(selectList4Button0);
+    assert_true(selectList4.open);
+
+    await clickOn(selectList4Option2);
+    assert_equals(selectList4.value, "two", "An option in a listbox should get controller code if its listbox is first in document order, even if another listbox was added dynamically");
+}, "Listbox controller code should be applied in flat tree traversal order regardless of dynamic insertion order");
+
+promise_test(async () => {
+    const selectList5 = document.getElementById("selectList5");
+    const selectList5ButtonSlot = document.getElementById("selectList5-button-slot");
+    const selectList5Button0 = document.getElementById("selectList5-button0");
+    const selectList5SelectedValue0 = document.getElementById("selectList5-selectedValue0");
+
+    assert_false(selectList3.open);
+    assert_equals(selectList5SelectedValue0.innerText, "one");
+
+    let selectedValue1 = document.createElement("div");
+    selectList5ButtonSlot.appendChild(selectedValue1);
+
+    await clickOn(selectList5Button0);
+    assert_true(selectList5.open);
+
+    await clickOn(document.getElementById("selectList5-option0"));
+    assert_false(selectList5.open);
+    assert_equals(selectList5SelectedValue0.innerText, "two", "first selected-value part in flat tree order should get controller code");
+    assert_equals(selectedValue1.innerText, "", "Dynamically inserted selected-value part shouldn't get controller code if it's not first in flat tree order");
+  }, "selected-value controller code should be applied in flat tree traversal order regardless of dynamic insertion order");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList9");
+    const originalListbox = document.getElementById("selectList9-originalListbox");
+    const option2 = document.getElementById("selectList9-option2");
+    assert_equals(selectList.value, "one", "Initial value should be the first option");
+
+    let newListbox = document.createElement("div");
+    newListbox.setAttribute("popover", "auto");
+    newListbox.setAttribute("behavior", "listbox");
+    let newOption = document.createElement("option");
+    newOption.innerText = "three";
+    newListbox.appendChild(newOption);
+    let newOption2 = document.createElement("option");
+    newOption2.innerText = "four";
+    newListbox.appendChild(newOption2);
+    originalListbox.parentElement.insertBefore(newListbox, originalListbox);
+
+    await clickOn(selectList);
+    assert_true(selectList.open, "Menu should open when clicked");
+
+    option2.click(); // clickOn doesn't work because the old options are not displayed
+    assert_equals(selectList.value, "three", "Elements in second popover should no longer be option parts");
+    assert_true(selectList.open, "Clicking non-part options shouldn't close the popover");
+
+    await clickOn(newOption2);
+    assert_false(selectList.open);
+    assert_equals(selectList.value, "four", "New options should get controller code after listbox switch");
+    }, "Ensure that option controller code is updated when listbox changes");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList10");
+    const selectList10SlottedOption = document.getElementById("selectList10-slottedOption");
+
+    await clickOn(selectList10SlottedOption);
+    assert_false(selectList.open, "Controller code not applied due to part attribute missing");
+    selectList10SlottedOption.setAttribute("behavior", "button");
+    await clickOn(selectList10SlottedOption);
+    assert_true(selectList.open);
+
+    const option2 = document.getElementById("selectList10-option2");
+    await clickOn(option2);
+    assert_equals(selectList.value, "two");
+    assert_false(selectList.open);
+
+    selectList10SlottedOption.slot = "";
+    await clickOn(selectList);
+    assert_true(selectList.open, "Default button part should be used");
+    await clickOn(selectList10SlottedOption);
+    assert_equals(selectList.value, "Test 10");
+  }, "Ensure that controller code is applied after updating the slot attribute");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList11");
+    const selectList11Button= document.getElementById("selectList11-button");
+
+    await clickOn(selectList11Button);
+    assert_false(selectList.open, "Controller code not applied due to part attribute not being button");
+    selectList11Button.remove();
+
+    await clickOn(selectList);
+    assert_true(selectList.open, "Default button part should be used");
+  }, "Ensure that controller code is applied when slot and part attributes are different");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList12");
+    const originalListbox = document.getElementById("selectList12-originalListbox");
+    assert_equals(selectList.value, "one", "Initial value should be the first option");
+
+    const selectListButtonSlot = document.getElementById("selectList12-button-slot");
+    const selectListButton0 = document.getElementById("selectList12-button0");
+    const selectListOption1 = document.getElementById("selectList12-option1");
+
+    assert_false(selectList.open);
+    let button1 = document.createElement("div");
+    button1.innerText = "button1";
+    button1.setAttribute("behavior", "button");
+    selectListButtonSlot.insertBefore(button1, selectListButton0);
+    button1.click();
+    assert_true(selectList.open, "Controller code should be applied to the new first button in document order");
+    await clickOn(selectListOption1);
+    assert_false(selectList.open);
+    selectListButton0.click();
+    assert_false(selectList.open);
+
+    let button2 = document.createElement("div");
+    button2.innerText = "button2";
+    selectListButtonSlot.insertBefore(button2, button1);
+    button2.click();
+    assert_false(selectList.open, "Controller code should not be applied to button2 since it doesn't have behavior attribute set");
+    button2.setAttribute("behavior", "button");
+    button2.click();
+    assert_true(selectList.open, "Controller code should be applied to the new button part");
+    await clickOn(selectListOption1);
+    assert_false(selectList.open);
+
+    let newListbox = document.createElement("div");
+    newListbox.setAttribute("popover", "auto");
+    newListbox.setAttribute("behavior", "listbox");
+    let newOption = document.createElement("option");
+    newOption.innerText = "three";
+    newListbox.appendChild(newOption);
+    let newOption2 = document.createElement("option");
+    newOption2.innerText = "four";
+    newListbox.appendChild(newOption2);
+    originalListbox.parentElement.insertBefore(newListbox, originalListbox);
+    assert_equals(selectList.value, "three", "New value should be the first option");
+
+    newListbox.innerHTML = "<option>five</option><option>six</option>";
+    assert_equals(selectList.value, "five", "New value should be the first option");
+
+    selectList.innerHTML = "<option>seven</option><option id='selectList12-option2'>eight</option>";
+    assert_equals(selectList.value, "seven", "New value should be the first option");
+    const selectListOption2 = document.getElementById("selectList12-option2");
+    await clickOn(selectList);
+    assert_true(selectList.open);
+    await clickOn(selectListOption2);
+    assert_equals(selectList.value, "eight", "Controller code should be applied to new options");
+
+    selectListOption2.slot = "button";
+    assert_equals(selectList.value, "seven", "Previous selected option should become invalid");
+  }, "Ensure that controller code is synchronously applied");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList13");
+    assert_equals(selectList.value, "one");
+
+    const selectListButton0 = document.getElementById("selectList13-button0");
+    const selectListButton1 = document.getElementById("selectList13-button1");
+    selectListButton1.click();
+    assert_false(selectList.open);
+    selectListButton0.click();
+    assert_true(selectList.open, "First button should receive controller code");
+    await clickOn(document.getElementById("selectList13-option2"));
+    assert_equals(selectList.value, "two");
+    let divButtonToRemove = document.getElementById("selectList13-removeContent-button");
+    divButtonToRemove.innerHTML = "";
+    selectListButton0.click();
+    assert_false(selectList.open, "The first button is invalid");
+    const selectListButton2 = document.getElementById("selectList13-button2");
+    selectListButton2.click();
+    assert_true(selectList.open, "The button part should be updated")
+    await clickOn(document.getElementById("selectList13-option1"));
+    assert_equals(selectList.value, "one");
+
+    const selectListOption4 = document.getElementById("selectList13-option4");
+    selectListOption4.click();
+    assert_equals(selectList.value, "one");
+    let divListboxToRemove = document.getElementById("selectList13-removeContent-listbox");
+    divListboxToRemove.innerHTML = "";
+    assert_equals(selectList.value, "three", "The listbox part should be updated");
+    selectListOption4.click();
+    assert_equals(selectList.value, "four", "Controller code should be applied to the new options");
+
+    let selectListNewListbox = document.getElementById("selectList13-newListbox");
+    selectListNewListbox.innerHTML = "";
+    assert_equals(selectList.value, "");
+    selectListOption4.click();
+    assert_equals(selectList.value, "");
+  }, "Controller code should be updated when nested parts are removed");
+
+  promise_test(async () => {
+    let selectList = document.getElementById("selectList14");
+    assert_equals(selectList.value, "one");
+    const selectListButton0 = document.getElementById("selectList14-button0");
+    const selectListOption2 = document.getElementById("selectList14-option2");
+
+    selectListButton0.click();
+    assert_true(selectList.open);
+    await clickOn(selectListOption2);
+    assert_equals(selectList.value, "two");
+
+    document.body.removeChild(selectList);
+    selectList.removeChild(selectListOption2);
+    assert_equals(selectList.value, "one");
+    let newOption = document.createElement("option");
+    newOption.innerText = "three";
+    selectList.appendChild(newOption);
+    newOption.click();
+    assert_equals(selectList.value, "three", "New option should receive controller code");
+
+    let doc = document.implementation.createHTMLDocument('');
+    let selectList1 = doc.createElement('selectlist');
+    let firstOption = doc.createElement('option');
+    firstOption.innerText = 'one';
+    let secondOption = doc.createElement('option');
+    secondOption.innerText = 'two';
+    selectList1.appendChild(firstOption);
+    selectList1.appendChild(secondOption);
+    assert_equals(selectList1.value, "one");
+    secondOption.click();
+    assert_equals(selectList1.value, "two");
+    document.body.appendChild(selectList1);
+    selectList1.removeChild(secondOption);
+    assert_equals(selectList1.value, "one");
+  }, "Moving a selectlist between documents should keep controller code active");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList15");
+    const selectListButtonContainer = document.getElementById("selectList15-div0");
+
+    const outerDiv = document.createElement("div");
+    const button = document.createElement("input");
+    button.type = button.value = "button";
+    button.setAttribute("behavior", "button");
+    outerDiv.appendChild(button);
+    selectListButtonContainer.appendChild(outerDiv);
+
+    await clickOn(selectList);
+    assert_true(selectList.open, "New button should receive controller code");
+  }, "New parts should be detected even when in the subtree of an inserted node");
+
+  promise_test(async () => {
+    const selectList = document.getElementById("selectList16");
+    const selectListButtonContainer = document.getElementById("selectList16-div0");
+    const selectListButton = document.getElementById("selectList16-button0");
+
+    selectListButtonContainer.remove();
+
+    selectListButton.click();
+    assert_false(selectList.open, "Removed button should no longer have controller code");
+  }, "Part removals should be detected even when in the subtree of a removed node");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position-with-zoom.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position-with-zoom.tentative.html
new file mode 100644
index 00000000000..2f61af1a11f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position-with-zoom.tentative.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html>
+<title>HTMLSelectListElement Test: popover position with zoom</title>
+<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
+<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>
+  #selectList0 {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    zoom: 2;
+  }
+
+  #selectList1 {
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
+    zoom: 1.5;
+  }
+
+  #selectList1-popover {
+    zoom: 2;
+  }
+
+  #selectList2 {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    zoom: 3;
+  }
+
+  #selectList3 {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+    zoom: 4;
+  }
+
+  #selectList3-popover {
+    zoom: 1.5;
+  }
+</style>
+
+<selectlist id="selectList0">
+  <div slot="button" behavior="button" id="selectList0-button">Custom bottom left</div>
+  <div popover slot="listbox" behavior="listbox" id="selectList0-popover">
+    <option>bottom left</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+<br>
+
+<selectlist id="selectList1">
+  <div slot="button" behavior="button" id="selectList1-button">Custom top left</div>
+  <div popover slot="listbox" behavior="listbox" id="selectList1-popover">
+    <option>top left</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList2">
+  <div slot="button" behavior="button" id="selectList2-button">Custom bottom right</div>
+  <div popover slot="listbox" behavior="listbox" id="selectList2-popover">
+    <option>bottom right</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList3">
+  <div slot="button" behavior="button" id="selectList3-button">Custom top right</div>
+  <div popover slot="listbox" behavior="listbox" id="selectList3-popover">
+    <option>top right</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+
+<script>
+  function clickOn(element) {
+    const actions = new test_driver.Actions();
+    return actions.pointerMove(0, 0, {origin: element})
+      .pointerDown({button: actions.ButtonType.LEFT})
+      .pointerUp({button: actions.ButtonType.LEFT})
+      .send();
+  }
+
+  promise_test(async () => {
+    const selectList0 = document.getElementById("selectList0");
+    const selectList0Popover = document.getElementById("selectList0-popover");
+    const selectList0Button = document.getElementById("selectList0-button");
+
+    await clickOn(selectList0);
+    assert_equals(Math.abs(Math.trunc(selectList0.getBoundingClientRect().bottom - selectList0Popover.getBoundingClientRect().top)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList0.getBoundingClientRect().left - selectList0Popover.getBoundingClientRect().left)), 0);
+  }, "The popover should be bottom left positioned");
+
+  promise_test(async () => {
+    const selectList1 = document.getElementById("selectList1");
+    const selectList1Popover = document.getElementById("selectList1-popover");
+    const selectList1Button = document.getElementById("selectList1-button");
+
+    selectList1Button.click();
+    assert_equals(Math.abs(Math.trunc(selectList1.getBoundingClientRect().top - selectList1Popover.getBoundingClientRect().bottom * 2)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList1.getBoundingClientRect().left - selectList1Popover.getBoundingClientRect().left * 2)), 0);
+  }, "The popover should be top left positioned");
+
+  promise_test(async () => {
+    const selectList2 = document.getElementById("selectList2");
+    const selectList2Popover = document.getElementById("selectList2-popover");
+    const selectList2Button = document.getElementById("selectList2-button");
+
+    selectList2Button.click();
+    assert_equals(Math.abs(Math.trunc(selectList2.getBoundingClientRect().bottom - selectList2Popover.getBoundingClientRect().top)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList2.getBoundingClientRect().right - selectList2Popover.getBoundingClientRect().right)), 0);
+  }, "The popover should be bottom right positioned");
+
+  promise_test(async () => {
+    const selectList3 = document.getElementById("selectList3");
+    const selectList3Popover = document.getElementById("selectList3-popover");
+    const selectList3Button = document.getElementById("selectList3-button");
+
+    selectList3Button.click();
+    assert_equals(Math.abs(Math.trunc(selectList3.getBoundingClientRect().top - selectList3Popover.getBoundingClientRect().bottom * 1.5)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList3.getBoundingClientRect().right - selectList3Popover.getBoundingClientRect().right * 1.5)), 0);
+  }, "The popover should be top right positioned");
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position.tentative.html
new file mode 100644
index 00000000000..a19e2b0d282
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover-position.tentative.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+<title>HTMLSelectListElement Test: popover position</title>
+<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
+<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>
+  #selectList0 {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+  }
+
+  #selectList1 {
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
+  }
+
+  #selectList2 {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+  }
+
+  #selectList3 {
+    position: absolute;
+    bottom: 0px;
+    right: 0px;
+  }
+</style>
+
+<selectlist id="selectList0">
+  <div popover slot="listbox" behavior="listbox" id="selectList0-popover">
+    <option>bottom left</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+<br>
+
+<selectlist id="selectList1">
+  <div popover slot="listbox" behavior="listbox" id="selectList1-popover">
+    <option>top left</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList2">
+  <div popover slot="listbox" behavior="listbox" id="selectList2-popover">
+    <option>bottom right</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList3">
+  <div popover slot="listbox" behavior="listbox" id="selectList3-popover">
+    <option>top right</option>
+    <option>two</option>
+    <option>three</option>
+  </div>
+</selectlist>
+
+<script>
+  function clickOn(element) {
+    const actions = new test_driver.Actions();
+    return actions.pointerMove(0, 0, {origin: element})
+      .pointerDown({button: actions.ButtonType.LEFT})
+      .pointerUp({button: actions.ButtonType.LEFT})
+      .send();
+  }
+
+  promise_test(async () => {
+    const selectList0 = document.getElementById("selectList0");
+    const selectList0Popover = document.getElementById("selectList0-popover");
+
+    await clickOn(selectList0);
+    assert_equals(Math.abs(Math.trunc(selectList0.getBoundingClientRect().bottom - selectList0Popover.getBoundingClientRect().top)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList0.getBoundingClientRect().left - selectList0Popover.getBoundingClientRect().left)), 0);
+  }, "The popover should be bottom left positioned");
+
+  promise_test(async () => {
+    const selectList1 = document.getElementById("selectList1");
+    const selectList1Popover = document.getElementById("selectList1-popover");
+
+    await clickOn(selectList1);
+    assert_equals(Math.abs(Math.trunc(selectList1.getBoundingClientRect().top - selectList1Popover.getBoundingClientRect().bottom)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList1.getBoundingClientRect().left - selectList1Popover.getBoundingClientRect().left)), 0);
+  }, "The popover should be top left positioned");
+
+  promise_test(async () => {
+    const selectList2 = document.getElementById("selectList2");
+    const selectList2Popover = document.getElementById("selectList2-popover");
+
+    await clickOn(selectList2);
+    assert_equals(Math.abs(Math.trunc(selectList2.getBoundingClientRect().bottom - selectList2Popover.getBoundingClientRect().top)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList2.getBoundingClientRect().right - selectList2Popover.getBoundingClientRect().right)), 0);
+  }, "The popover should be bottom right positioned");
+
+  promise_test(async () => {
+    const selectList3 = document.getElementById("selectList3");
+    const selectList3Popover = document.getElementById("selectList3-popover");
+
+    await clickOn(selectList3);
+    assert_equals(Math.abs(Math.trunc(selectList3.getBoundingClientRect().top - selectList3Popover.getBoundingClientRect().bottom)), 0);
+    assert_equals(Math.abs(Math.trunc(selectList3.getBoundingClientRect().right - selectList3Popover.getBoundingClientRect().right)), 0);
+  }, "The popover should be top right positioned");
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html
new file mode 100644
index 00000000000..b7663875ce0
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-popover.tentative.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<title>HTMLSelectListElement Test: popover</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>
+
+<selectlist id="selectList0">
+  <option>one</option>
+  <option id="selectList0-child2">two</option>
+  <div id="selectList0-child3">I'm a div with no part attr</div>
+  <option>three</option>
+  <option>four</option>
+</selectlist>
+
+<selectlist id="selectList1">
+  <div slot="button" behavior="button" class="button">
+    Custom button
+  </div>
+  <div popover slot="listbox" behavior="listbox">
+    <option>one</option>
+    <option class="child2">two</option>
+    <option class="child3">three</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList2">
+  <!-- Swap out the listbox part without providing a replacement -->
+  <div slot="listbox"></div>
+</selectlist>
+
+<selectlist id="selectList3">
+  <div slot="listbox">
+    <div popover behavior="listbox" id="selectList3-listbox">
+      <option>one</option>
+    </div>
+  </div>
+</selectlist>
+<script>
+
+  function clickOn(element) {
+    const actions = new test_driver.Actions();
+    return actions.pointerMove(0, 0, {origin: element})
+      .pointerDown({button: actions.ButtonType.LEFT})
+      .pointerUp({button: actions.ButtonType.LEFT})
+      .send();
+  }
+
+  promise_test(async () => {
+    const selectList0 = document.getElementById("selectList0");
+    const selectList0Child2 = document.getElementById("selectList0-child2");
+    const selectList0Child3 = document.getElementById("selectList0-child3");
+    assert_equals(selectList0.value, "one");
+    assert_equals(selectList0.open, false);
+    await clickOn(selectList0);
+    assert_equals(selectList0.open, true);
+    await clickOn(selectList0Child2);
+    assert_equals(selectList0.value, "two");
+    assert_equals(selectList0.open, false);
+
+    await clickOn(selectList0);
+    assert_equals(selectList0.open, true);
+    await clickOn(selectList0Child3);
+    assert_equals(selectList0.value, "two", "Clicking a non-option should not change the value");
+    assert_equals(selectList0.open, true);
+    await clickOn(selectList0Child2);
+    assert_equals(selectList0.open, false);
+  }, "Opening the popover and clicking an option should change the selectlist's value");
+
+  promise_test(async () => {
+    const selectList1 = document.getElementById("selectList1");
+    const button = selectList1.querySelector(".button");
+    const child2 = selectList1.querySelector(".child2");
+    const child3 = selectList1.querySelector(".child3");
+    assert_equals(selectList1.value, "one");
+    assert_equals(selectList1.open, false);
+    await clickOn(button);
+    assert_equals(selectList1.open, true);
+    await clickOn(child2);
+    assert_equals(selectList1.value, "two", "Clicking an <option> should change the value");
+    assert_equals(selectList1.open, false);
+
+    await clickOn(button);
+    assert_equals(selectList1.open, true);
+    await clickOn(child3);
+    assert_equals(selectList1.value, "three", "Clicking a <div part='option'> should change the value");
+    assert_equals(selectList1.open, false);
+  }, "With custom button and popover: opening the popover and clicking an option should change the selectlist's value");
+
+  promise_test(async () => {
+    const selectList2 = document.getElementById("selectList2");
+    await clickOn(selectList2);
+    assert_equals(selectList2.value, "");
+    assert_equals(selectList2.open, false);
+  }, "Clicking a popover with no listbox part does nothing");
+
+  promise_test(async () => {
+    const selectList3 = document.getElementById("selectList3");
+    const selectList3Listbox = document.getElementById("selectList3-listbox");
+    selectList3Listbox.remove();
+
+    await clickOn(selectList3);
+    assert_equals(selectList3.value, "");
+    assert_equals(selectList3.open, false);
+  }, "Clicking a popover with a listbox that was removed does nothing");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-light-dismiss-invalidation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-light-dismiss-invalidation.tentative.html
new file mode 100644
index 00000000000..bda5842a37c
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-light-dismiss-invalidation.tentative.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="http://crbug.com/1429839">
+<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>
+
+<selectlist id=selectlist>
+  <option id=optone>one</option>
+  <option id=opttwo>two</option>
+</selectlist>
+<style>
+selectlist {
+  background-color: rgb(0, 0, 255);
+}
+selectlist:closed {
+  background-color: rgb(0, 255, 0);
+}
+selectlist:open {
+  background-color: rgb(255, 0, 0);
+}
+</style>
+<button id=button>hello world</button>
+
+<script>
+promise_test(async () => {
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(0, 255, 0)',
+    'The selectlist should match :closed at the start of the test.');
+
+  await test_driver.click(selectlist);
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(255, 0, 0)',
+    'The selectlist should match :open when opened.');
+
+  await test_driver.click(opttwo);
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(0, 255, 0)',
+    'The selectlist should match :closed after clicking an option.');
+
+  await test_driver.click(selectlist);
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(255, 0, 0)',
+    'The selectlist should match :open when reopened.');
+
+  await test_driver.click(button);
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(0, 255, 0)',
+    'The selectlist should match :closed after light dismiss.');
+}, 'selectlist should not match :open when light dismissed.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html
new file mode 100644
index 00000000000..3184fe786c1
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-pseudo-open-closed.tentative.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/547">
+<link rel=help href="https://drafts.csswg.org/selectors/#open-state">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<selectlist id=myselectlist>
+  <button id=custombutton slot=button behavior=button>button</button>
+  <option>one</option>
+  <option>two</option>
+</selectlist>
+
+<script>
+test(() => {
+  assert_false(myselectlist.matches(':open'),
+    'Selectlist should not match :open while it is closed.');
+  assert_true(myselectlist.matches(':closed'),
+    'Selectlist should match :closed while it is closed.');
+
+  custombutton.click();
+
+  assert_true(myselectlist.matches(':open'),
+    'Selectlist should match :open while it is open.');
+  assert_false(myselectlist.matches(':closed'),
+    'Selectlist should not match :closed while it is open.');
+}, 'Selectlist should support :open and :closed pseudo selectors.');
+</script>
+
+<selectlist id=selectlistinvalidation>
+  <button slot=button behavior=button>button</button>
+  <option>one</option>
+  <option>two</option>
+</selectlist>
+<style>
+selectlist:closed {
+  background-color: red;
+}
+selectlist:open {
+  background-color: green;
+}
+</style>
+
+<script>
+test(() => {
+  const selectlist = document.getElementById('selectlistinvalidation');
+  const button = selectlist.querySelector('button');
+  const option = selectlist.querySelector('option');
+
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(255, 0, 0)',
+    'The style rules from :closed should apply when the selectlist is closed.');
+
+  button.click();
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(0, 128, 0)',
+    'The style rules from :open should apply when the selectlist is open.');
+
+  option.click();
+  assert_equals(getComputedStyle(selectlist).backgroundColor, 'rgb(255, 0, 0)',
+    'The style rules from :closed should apply when the selectlist is opened and closed again.');
+}, 'Selectlist :open and :closed should invalidate correctly.');
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-required-attribute.tentative.html
similarity index 58%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-required-attribute.tentative.html
index ea6d1b215d7..ef4408915b3 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-required-attribute.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-required-attribute.tentative.html
@@ -1,37 +1,37 @@
 <!DOCTYPE html>
 <html lang="en">
-<title>HTMLSelectMenuElement Test: required attribute</title>
+<title>HTMLSelectListElement Test: required attribute</title>
 <link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <style>
-  selectmenu:required {
+  selectlist:required {
     border: 3px dashed rgb(255, 0, 0);
   }
 
-  selectmenu:optional {
+  selectlist:optional {
     border: 1px solid rgb(128, 128, 128);
   }
 </style>
 
-<selectmenu id="selectmenu0" required>
+<selectlist id="selectlist0" required>
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectmenu1">
+<selectlist id="selectlist1">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id="selectmenu2">
+<selectlist id="selectlist2">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 
 <script>
 function checkRequired(style) {
@@ -47,15 +47,15 @@ function checkOptional(style) {
 }
 
 test(() => {
-  const selectMenu0 = document.getElementById("selectmenu0");
-  const selectMenu1 = document.getElementById("selectmenu1");
-  const selectMenu2 = document.getElementById("selectmenu2");
+  const selectList0 = document.getElementById("selectlist0");
+  const selectList1 = document.getElementById("selectlist1");
+  const selectList2 = document.getElementById("selectlist2");
 
-  checkRequired(window.getComputedStyle(selectMenu0));
-  checkOptional(window.getComputedStyle(selectMenu1));
-  checkOptional(window.getComputedStyle(selectMenu2));
-  selectMenu2.required = true;
-  checkRequired(window.getComputedStyle(selectMenu2));
+  checkRequired(window.getComputedStyle(selectList0));
+  checkOptional(window.getComputedStyle(selectList1));
+  checkOptional(window.getComputedStyle(selectList2));
+  selectList2.required = true;
+  checkRequired(window.getComputedStyle(selectList2));
 }, "Test required attribute");
 
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html
new file mode 100644
index 00000000000..70d2b98d330
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl-ref.tentative.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('option');
+  document.body.appendChild(selectlist);
+  selectlist.style.direction = "rtl";
+  selectlist.style.width = "300px";
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html
similarity index 50%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html
index 90c06c93d76..24f79596321 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-rtl.tentative.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
-<!-- Tests selectmenu text alignment in rtl -->
+<!-- Tests selectlist text alignment in rtl -->
 <link rel=author href="mailto:pkotwicz@chromium.org">
-<link rel="match" href="selectmenu-rtl-ref.tentative.html">
+<link rel="match" href="selectlist-rtl-ref.tentative.html">
 
 <style>
-selectmenu {
+selectlist {
   direction:rtl;
   width:300px;
 }
 </style>
-<selectmenu>
+<selectlist>
   <option>option</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior-ref.html
new file mode 100644
index 00000000000..7d76f1c8176
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('hello world');
+  document.body.appendChild(selectlist);
+  selectlist.querySelector('.fake-selectlist-selected-value')
+    .style.color = 'blue';
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html
similarity index 66%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html
index 799b4451141..a43e43d267a 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-behavior.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
-<link rel=match href="selectmenu-selected-value-behavior-ref.html">
+<link rel=match href="selectlist-selected-value-behavior-ref.html">
 
-<selectmenu>
+<selectlist>
   <div style="color:blue" slot=selected-value behavior=selected-value></div>
   <option>hello world</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part-ref.html
new file mode 100644
index 00000000000..3be168beba9
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('hello world');
+  document.body.appendChild(selectlist);
+  selectlist.querySelector('.fake-selectlist-selected-value')
+    .style.backgroundColor = 'red';
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html
similarity index 53%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html
index e41d2ddfd66..8fc05480d15 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-part.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
-<link rel=match href="selectmenu-selected-value-part-ref.html">
+<link rel=match href="selectlist-selected-value-part-ref.html">
 
 <style>
-selectmenu::part(selected-value) {
+selectlist::part(selected-value) {
   background-color: red;
 }
 </style>
-<selectmenu>
+<selectlist>
   <option>hello world</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot-ref.html
new file mode 100644
index 00000000000..ecb8c886a1d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<script src="support/fake-selectlist.js"></script>
+<body>
+<script>
+  const selectlist = createFakeSelectlist('hello world');
+  document.body.appendChild(selectlist);
+
+  const oldSelectedValue = selectlist.querySelector('.fake-selectlist-selected-value');
+  const newSelectedValue = document.createElement('div');
+  newSelectedValue.textContent = 'new selected value';
+
+  replaceChildElement(newSelectedValue, oldSelectedValue);
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html
similarity index 62%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html
index 9bbf2dfc06e..c69a962c295 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-selected-value-slot.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
-<link rel=match href="selectmenu-selected-value-slot-ref.html">
+<link rel=match href="selectlist-selected-value-slot-ref.html">
 
-<selectmenu>
+<selectlist>
   <div slot=selected-value>new selected value</div>
   <option>hello world</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-tab-navigation.tentative.html
similarity index 71%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-tab-navigation.tentative.html
index 3d583335ed1..3b7d9d3d9ad 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tab-navigation.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-tab-navigation.tentative.html
@@ -6,11 +6,11 @@
 <script src="/resources/testdriver-vendor.js"></script>
 
 <input id="input1">
-<selectmenu id="selectmenu">
+<selectlist id="selectlist">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 <input id="input3">
 
 <script>
@@ -18,16 +18,16 @@ promise_test(async () => {
   const TAB_KEY = "\uE004";
 
   const input1 = document.getElementById("input1");
-  const selectmenu = document.getElementById("selectmenu");
+  const selectlist = document.getElementById("selectlist");
 
   input1.focus();
   assert_equals(document.activeElement.id, "input1", "input1 should be active");
 
   await test_driver.send_keys(input1, TAB_KEY);
-  assert_equals(document.activeElement.id, "selectmenu", "selectmenu should be active");
+  assert_equals(document.activeElement.id, "selectlist", "selectlist should be active");
 
-  await test_driver.send_keys(selectmenu, TAB_KEY);
+  await test_driver.send_keys(selectlist, TAB_KEY);
   assert_equals(document.activeElement.id, "input3", "input3 should be active");
-}, "Check that <selectmenu> occupies just one slot in tab navigation.");
+}, "Check that <selectlist> occupies just one slot in tab navigation.");
 </script>
 
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-tabindex-order.tentative.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-tabindex-order.tentative.html
index b4fa2a1e757..c93efe1118e 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-tabindex-order.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-tabindex-order.tentative.html
@@ -6,11 +6,11 @@
 <script src="/resources/testdriver-vendor.js"></script>
 
 <input id="input1">
-<selectmenu id="selectmenu" tabindex="2">
+<selectlist id="selectlist" tabindex="2">
   <option>one</option>
   <option>two</option>
   <option>three</option>
-</selectmenu>
+</selectlist>
 <input id="input3" tabindex="1">
 
 <script>
@@ -27,7 +27,7 @@ promise_test(async () => {
   assert_equals(document.activeElement.id, "input3", "input3 should be active");
 
   await test_driver.send_keys(input3, TAB_KEY);
-  assert_equals(document.activeElement.id, "selectmenu", "selectmenu should be active");
-}, "Check that tabindex applies to <selectmenu>");
+  assert_equals(document.activeElement.id, "selectlist", "selectlist should be active");
+}, "Check that tabindex applies to <selectlist>");
 </script>
 
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html
similarity index 81%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html
index dc6e2e230c0..078e8a4d83c 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-user-select.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-user-select.tentative.html
@@ -4,30 +4,30 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<selectmenu id=useragent>
+<selectlist id=useragent>
   <option id=useragentoptionone>one</option>
   <option id=useragentoptiontwo>two</option>
-</selectmenu>
+</selectlist>
 
-<selectmenu id=custom>
+<selectlist id=custom>
   <div id=custombutton slot=button behavior=button>button</div>
   <div id=customlistbox popover=auto slot=listbox behavior=listbox>listbox</div>
-</selectmenu>
+</selectlist>
 
-<selectmenu id=customwithselection style="user-select:auto">
+<selectlist id=customwithselection style="user-select:auto">
   <div id=custombuttonwithselection slot=button behavior=button>button</div>
   <div id=customlistboxwithselection popover=auto slot=listbox behavior=listbox>listbox</div>
-</selectmenu>
+</selectlist>
 
-<selectmenu id=customwithmixedselection>
+<selectlist id=customwithmixedselection>
   <div id=custombuttonwithmixedselection slot=button behavior=button style="user-select:auto">button</div>
   <div id=customlistboxwithmixedselection popover=auto slot=listbox behavior=listbox style="user-select:auto">listbox</div>
-</selectmenu>
+</selectlist>
 
 <script>
 test(() => {
   assert_equals(getComputedStyle(useragent).userSelect, 'none',
-    'The selectmenu should have user-select:none.');
+    'The selectlist should have user-select:none.');
   assert_equals(getComputedStyle(useragentoptionone).userSelect, 'none',
     'The first option should have user-select:none.');
   assert_equals(getComputedStyle(useragentoptiontwo).userSelect, 'none',
@@ -36,7 +36,7 @@ test(() => {
 
 test(() => {
   assert_equals(getComputedStyle(custom).userSelect, 'none',
-    'The selectmenu should have user-select:none.');
+    'The selectlist should have user-select:none.');
   assert_equals(getComputedStyle(custombutton).userSelect, 'none',
     'The custom button should have user-select:none.');
   assert_equals(getComputedStyle(customlistbox).userSelect, 'none',
@@ -45,19 +45,19 @@ test(() => {
 
 test(() => {
   assert_equals(getComputedStyle(customwithselection).userSelect, 'auto',
-    'The selectmenu should have user-select:auto.');
+    'The selectlist should have user-select:auto.');
   assert_equals(getComputedStyle(custombuttonwithselection).userSelect, 'auto',
     'The custom button should have user-select:auto.');
   assert_equals(getComputedStyle(customlistboxwithselection).userSelect, 'auto',
     'The custom listbox should have user-select:auto.');
-}, 'Setting user-select:auto on selectmenus should re-enable selection.');
+}, 'Setting user-select:auto on selectlists should re-enable selection.');
 
 test(() => {
   assert_equals(getComputedStyle(customwithmixedselection).userSelect, 'none',
-    'The selectmenu should have user-select:none.');
+    'The selectlist should have user-select:none.');
   assert_equals(getComputedStyle(custombuttonwithmixedselection).userSelect, 'auto',
     'The custom button should have user-select:auto.');
   assert_equals(getComputedStyle(customlistboxwithmixedselection).userSelect, 'auto',
     'The custom listbox should have user-select:auto.');
-}, 'Children of selectmenu should be able to opt-in to user-select.');
+}, 'Children of selectlist should be able to opt-in to user-select.');
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html
new file mode 100644
index 00000000000..2b2033f6688
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-validity.tentative.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en">
+<title>HTMLSelectListElement Test: validity</title>
+<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<selectlist id="selectlist1" required>
+  <option>one</option>
+  <option>two</option>
+  <option>three</option>
+  <option>four</option>
+</selectlist>
+
+<form>
+  <selectlist id="selectlist2" required>
+  </selectlist>
+</form>
+
+<script>
+
+test(() => {
+  let selectList = document.createElement('selectlist');
+  assert_true(selectList.willValidate, "A selectlist element is a submittable element that is a candidate for constraint validation.");
+  let option = document.createElement('option');
+  selectList.appendChild(option);
+  assert_true(selectList.checkValidity(), "Always valid when the selectlist isn't a required value.");
+
+  selectList.required = true;
+  assert_equals(selectList.value, "");
+  assert_false(selectList.checkValidity(), "A selected placeholder option should invalidate the selectlist.");
+
+  let emptyOption = document.createElement('option');
+  selectList.appendChild(emptyOption);
+  assert_false(selectList.checkValidity(), "A selected placeholder option should invalidate the selectlist even if there are multiple options.");
+  emptyOption.selected = true;
+  assert_true(selectList.checkValidity(), "An empty non-placeholder option should be a valid choice.");
+
+  let filledOption = document.createElement('option');
+  filledOption.value = "test";
+  selectList.appendChild(filledOption);
+  filledOption.selected = true;
+  assert_equals(selectList.value, "test", "The non-empty value should be set.");
+  assert_true(selectList.checkValidity(), "A non-empty non-placeholder option should be a valid choice.");
+
+  selectList.removeChild(option);
+  selectList.appendChild(emptyOption);
+  emptyOption.selected = true;
+  assert_equals(selectList.value, "", "The empty value should be set.");
+  assert_true(selectList.checkValidity(), "Only the first option can be seen as a placeholder.");
+
+  selectList.removeChild(filledOption);
+  assert_false(selectList.checkValidity(), "A selected placeholder option should invalidate the selectlist.");
+
+  emptyOption.value = "test2";
+  assert_equals(selectList.value, "test2");
+  assert_true(selectList.checkValidity(), "A non-empty option value should be a valid choice.");
+
+  emptyOption.removeAttribute("value");
+  assert_equals(selectList.value, "");
+  assert_false(selectList.checkValidity());
+  emptyOption.innerText = "test";
+  assert_equals(selectList.value, "test");
+  assert_true(selectList.checkValidity(), "A non-empty option should be a valid choice.");
+
+  const selectList1 = document.getElementById('selectlist1');
+  assert_equals(selectList1.value, "one");
+  assert_true(selectList1.checkValidity(), "A selectlist with non-empty placeholder option should be valid.");
+}, "Validation for placeholder option");
+
+test(() => {
+  const selectList2 = document.getElementById('selectlist2');
+  assert_equals(selectList2.value, "");
+  assert_false(selectList2.checkValidity());
+  let form = document.querySelector('form');
+  let invalidControl = form.querySelector('selectlist:invalid');
+  assert_equals(selectList2, invalidControl);
+  let didDispatchInvalid = false;
+  invalidControl.addEventListener('invalid', e => { didDispatchInvalid = true; });
+  let didDispatchSubmit = false;
+  form.addEventListener('submit', event => { event.preventDefault(); didDispatchSubmit = true; });
+
+  form.requestSubmit();
+  assert_true(didDispatchInvalid);
+  assert_false(didDispatchSubmit);
+}, "Check form not submitted for invalid selectlist");
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html
similarity index 68%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html
index bf58630816a..243067937cb 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-option.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-option.tentative.html
@@ -4,17 +4,17 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<selectmenu id=selectmenu>
+<selectlist id=selectlist>
   <option id=optone>innertext one</option>
   <option id=opttwo value=valueattribute>innertext two</option>
-</selectmenu>
+</selectlist>
 
 <script>
 test(() => {
-  assert_equals(selectmenu.value, 'innertext one',
+  assert_equals(selectlist.value, 'innertext one',
     'The first option should be selected initially.');
-  selectmenu.value = 'valueattribute';
-  assert_equals(selectmenu.value, 'valueattribute',
+  selectlist.value = 'valueattribute';
+  assert_equals(selectlist.value, 'valueattribute',
     'Assigning value should look at the options value, not innertext');
-}, 'selectmenu.value should reflect option.value');
+}, 'selectlist.value should reflect option.value');
 </script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html
new file mode 100644
index 00000000000..20e72ac1dcb
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-value-selectedOption.tentative.html
@@ -0,0 +1,224 @@
+<!DOCTYPE html>
+<title>HTMLSelectListElement Test: value and selectedOption</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<selectlist id="selectList0"></selectlist>
+
+<selectlist id="selectList1">
+  <option>one</option>
+  <option>two</option>
+  <div>I'm a div with no part attr</div>
+  <option id="selectList1-option3">three</option>
+  <option>four</option>
+</selectlist>
+
+<selectlist id="selectList2">
+  <div behavior="option">one</div>
+  <div behavior="option">two</div>
+  <div>I'm a div with no part attr</div>
+  <div behavior="option">three</div>
+  <div behavior="option">four</div>
+</selectlist>
+
+<selectlist id="selectList3">
+  <div>I'm a div with no part attr</div>
+  <option id="selectList3-child1">one</option>
+  <option id="selectList3-child2">two</option>
+  <option id="selectList3-child3">three</option>
+</selectlist>
+
+<selectlist id="selectList4">
+  <div slot="button" behavior="button">
+    <div behavior="selected-value" id="selectList4-custom-selected-value">Default custom selected-value text</div>
+  </div>
+  <option id="selectList4-option1">one</option>
+  <option id="selectList4-option2">two</option>
+</selectlist>
+
+<selectlist id="selectList5">
+  <div slot="button" behavior="button">
+    <div behavior="selected-value" id="selectList5-custom-selected-value">Default custom selected-value text</div>
+  </div>
+  <div popover slot="listbox" behavior="listbox">
+    <option id="selectList5-option1">one</option>
+    <option id="selectList5-option2">two</option>
+  </div>
+</selectlist>
+
+<selectlist id="selectList6">
+  <option id="selectList6-option1">one</option>
+  <option id="selectList6-option2" selected>two</option>
+  <option id="selectList6-option3">three</option>
+</selectlist>
+
+<selectlist id="selectList7">
+  <option id="selectList7-option1">one</option>
+  <option id="selectList7-option2" selected value="test">two</option>
+  <option>three</option>
+</selectlist>
+
+<script>
+
+test(() => {
+  const selectList0 = document.getElementById("selectList0");
+  assert_equals(selectList0.value, "");
+  assert_equals(selectList0.selectedOption, null);
+  selectList0.value = "something";
+  assert_equals(selectList0.value, "", "If there is no matching option, selectlist should be cleared");
+  assert_equals(selectList0.selectedOption, null);
+}, "Test that HTMLSelectList with no options has empty string for value and null for selectedOption");
+
+test(() => {
+  const selectList1 = document.getElementById("selectList1");
+  assert_equals(selectList1.value, "one", "value should start with the text of the first option part");
+
+  selectList1.value = "three";
+  assert_equals(selectList1.value, "three", "value can be set to the text of an option part");
+  assert_equals(selectList1.selectedOption, document.getElementById("selectList1-option3"));
+
+  selectList1.value = "I'm a div with no part attr";
+  assert_equals(selectList1.value, "", "If there is no matching option selectlist should be cleared");
+  assert_equals(selectList1.selectedOption, null);
+}, "Test value and selectedOption with HTMLOptionElement element option parts");
+
+test(() => {
+  const selectList1 = document.getElementById("selectList1");
+  selectList1.value = "one";
+  assert_equals(selectList1.value, "one");
+
+  selectList1.value = null;
+  assert_equals(selectList1.value, "");
+  assert_equals(selectList1.selectedOption, null);
+}, "Test value and selectedOption when value is null");
+
+test(() => {
+  const selectList1 = document.getElementById("selectList1");
+  selectList1.value = "one";
+  assert_equals(selectList1.value, "one");
+
+  selectList1.value = undefined;
+  assert_equals(selectList1.value, "");
+  assert_equals(selectList1.selectedOption, null);
+}, "Test value and selectedOption when value is undefined");
+
+test(() => {
+  const selectList2 = document.getElementById("selectList2");
+  assert_equals(selectList2.value, "", "Non-HTMLOptionElements shouldn't be treated as option parts");
+  assert_equals(selectList2.selectedOption, null);
+
+  selectList2.value = "three";
+  assert_equals(selectList2.value, "", "value can't be set when there are no option parts'");
+  assert_equals(selectList2.selectedOption, null);
+}, "Test value with non-HTMLOptionElement elements labeled as parts");
+
+test(() => {
+  const selectList3 = document.getElementById("selectList3");
+  assert_equals(selectList3.value, "one", "value should start with the text of the first option part");
+  assert_equals(selectList3.selectedOption, document.getElementById("selectList3-child1"));
+
+  document.getElementById("selectList3-child3").remove();
+  assert_equals(selectList3.value, "one", "Removing a non-selected option should not change the value");
+  assert_equals(selectList3.selectedOption, document.getElementById("selectList3-child1"));
+
+  document.getElementById("selectList3-child1").remove();
+  assert_equals(selectList3.value, "two", "When the selected option is removed, the new first option should become selected");
+  assert_equals(selectList3.selectedOption, document.getElementById("selectList3-child2"));
+
+  document.getElementById("selectList3-child2").remove();
+  assert_equals(selectList3.value, "", "When all options are removed, value should be the empty string");
+  assert_equals(selectList3.selectedOption, null);
+}, "Test that value and selectedOption are updated when options are removed");
+
+test(() => {
+  const selectList4 = document.getElementById("selectList4");
+  let customSelectedValuePart = document.getElementById("selectList4-custom-selected-value");
+  assert_equals(selectList4.value, "one", "value should start with the text of the first option part");
+  assert_equals(selectList4.selectedOption, document.getElementById("selectList4-option1"));
+  assert_equals(customSelectedValuePart.innerText, "one", "Custom selected value part should be set to initial value of selectlist");
+
+  selectList4.value = "two";
+  assert_equals(customSelectedValuePart.innerText, "two", "Custom selected value part should be updated when value of selectlist changes");
+  assert_equals(selectList4.selectedOption, document.getElementById("selectList4-option2"));
+}, "Test that slotted-in selected-value part is updated to value of selectlist");
+
+test(() => {
+  const selectList5 = document.getElementById("selectList5");
+  let customSelectedValuePart = document.getElementById("selectList5-custom-selected-value");
+  assert_equals(selectList5.value, "one", "value should start with the text of the first option part");
+  assert_equals(selectList5.selectedOption, document.getElementById("selectList5-option1"));
+  assert_equals(customSelectedValuePart.innerText, "one", "Custom selected value part should be set to initial value of selectlist");
+
+  selectList5.value = "two";
+  assert_equals(customSelectedValuePart.innerText, "two", "Custom selected value part should be updated when value of selectlist changes");
+  assert_equals(selectList5.selectedOption, document.getElementById("selectList5-option2"));
+}, "Test that option parts in a slotted-in listbox are reflected in the value property");
+
+test(() => {
+  let selectList = document.createElement('selectlist');
+  assert_equals(selectList.value, "");
+  let option = document.createElement('option');
+  option.innerText = "one";
+  selectList.appendChild(option);
+  assert_equals(selectList.value, "one");
+  assert_equals(selectList.selectedOption, option);
+
+  let newOption = document.createElement('option');
+  newOption.innerText = 'two';
+  selectList.appendChild(newOption);
+  selectList.value = "two";
+  assert_equals(selectList.value, "two");
+  assert_equals(selectList.selectedOption, newOption);
+
+  option.click();
+  assert_equals(selectList.value, "one");
+  assert_equals(selectList.selectedOption, option);
+}, "Test that value and selectedOption are correctly updated");
+
+test(() => {
+  const selectList = document.getElementById("selectList6");
+  let selectListOption1 = document.getElementById("selectList6-option1");
+
+  assert_equals(selectList.value, "two");
+  assert_equals(selectList.selectedOption, document.getElementById("selectList6-option2"));
+  assert_false(selectListOption1.selected);
+  selectListOption1.selected = true;
+  assert_equals(selectList.value, "one");
+  assert_equals(selectList.selectedOption, selectListOption1);
+
+  let newOption = document.createElement("option");
+  newOption.innerText = "four";
+  newOption.selected = true;
+  selectList.appendChild(newOption);
+  assert_equals(selectList.value, "four");
+  assert_equals(selectList.selectedOption, newOption);
+  assert_false(selectListOption1.selected);
+
+  selectList.value = "three";
+  assert_equals(selectList.selectedOption, document.getElementById("selectList6-option3"));
+  assert_false(newOption.selected);
+}, "Test that HTMLOption.selected updates selectlist.value and selectlist.selectedOption");
+
+test(() => {
+  const selectList = document.getElementById("selectList7");
+  let selectListOption1 = document.getElementById("selectList7-option1");
+
+  assert_equals(selectList.value, "test");
+  assert_equals(selectList.selectedOption, document.getElementById("selectList7-option2"));
+  assert_false(selectListOption1.selected);
+  selectListOption1.selected = true;
+  assert_equals(selectList.value, "one");
+  assert_equals(selectList.selectedOption, selectListOption1);
+
+  selectListOption1.value = "new test";
+  assert_equals(selectList.value, "new test");
+  assert_equals(selectList.selectedOption, selectListOption1);
+  selectListOption1.removeAttribute("value");
+  assert_equals(selectList.value, "one");
+  assert_equals(selectList.selectedOption, selectListOption1);
+  selectListOption1.value = "";
+  assert_equals(selectList.value, "");
+  assert_equals(selectList.selectedOption, selectListOption1);
+}, "Test that HTMLOption.value updates selectlist.value");
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html
similarity index 56%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html
index 15bd5916bdf..9973696ddd7 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-lr.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-lr.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
 <link rel=help href="https://github.com/openui/open-ui/issues/600">
-<link rel=mismatch href="selectmenu-writingmode-tb-ref.html">
+<link rel=mismatch href="selectlist-writingmode-tb-ref.html">
 
-<selectmenu style="writing-mode: vertical-lr">
+<selectlist style="writing-mode: vertical-lr">
   <option>hello</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html
similarity index 56%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html
index 9cc1056e35a..dc74203e69c 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-rl.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-rl.tentative.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <link rel=author href="mailto:jarhar@chromium.org">
 <link rel=help href="https://github.com/openui/open-ui/issues/600">
-<link rel=mismatch href="selectmenu-writingmode-tb-ref.html">
+<link rel=mismatch href="selectlist-writingmode-tb-ref.html">
 
-<selectmenu style="writing-mode: vertical-rl">
+<selectlist style="writing-mode: vertical-rl">
   <option>hello</option>
-</selectmenu>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-tb-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-tb-ref.html
new file mode 100644
index 00000000000..db922f5f9fb
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/selectlist-writingmode-tb-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<selectlist style="writing-mode: horizontal-tb">
+  <option>hello</option>
+</selectlist>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/back.html b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/back.html
similarity index 66%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/back.html
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/back.html
index 0d13a0f3b7c..9cc5a1d6034 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/back.html
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/back.html
@@ -1 +1,2 @@
+<!DOCTYPE html>
 <script>history.back()</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js
similarity index 63%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js
index 2e084450a36..c17fe1afc5f 100644
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/fake-selectmenu.js
+++ b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/fake-selectlist.js
@@ -2,14 +2,14 @@ function replaceChildElement(newChild, oldChild) {
   oldChild.parentElement.replaceChild(newChild, oldChild);
 }
 
-function createFakeSelectmenu(selectedValueText) {
-  const selectmenu = document.createElement('div');
-  selectmenu.classList.add('fake-selectmenu-internal-selectmenu-button');
-  selectmenu.innerHTML = `
-    <div class="fake-selectmenu-selected-value"></div>
-    <div class="fake-selectmenu-internal-selectmenu-button-icon"></div>
+function createFakeSelectlist(selectedValueText) {
+  const selectlist = document.createElement('div');
+  selectlist.classList.add('fake-selectlist-internal-selectlist-button');
+  selectlist.innerHTML = `
+    <div class="fake-selectlist-selected-value"></div>
+    <div class="fake-selectlist-internal-selectlist-button-icon"></div>
     <style>
-    .fake-selectmenu-internal-selectmenu-button {
+    .fake-selectlist-internal-selectlist-button {
       align-items: center;
       appearance: none;
       background-color: Field;
@@ -27,13 +27,13 @@ function createFakeSelectmenu(selectedValueText) {
       padding: 0.25em;
     }
 
-    .fake-selectmenu-selected-value {
+    .fake-selectlist-selected-value {
       color: FieldText;
       flex-grow:1;
     }
 
-    .fake-selectmenu-internal-selectmenu-button-icon {
-      background-image: url(support/selectmenu_button_icon.svg);
+    .fake-selectlist-internal-selectlist-button-icon {
+      background-image: url(support/selectlist_button_icon.svg);
       background-origin: content-box;
       background-repeat: no-repeat;
       background-size: contain;
@@ -51,8 +51,8 @@ function createFakeSelectmenu(selectedValueText) {
   `;
 
   if (selectedValueText) {
-    selectmenu.querySelector('.fake-selectmenu-selected-value').textContent = selectedValueText;
+    selectlist.querySelector('.fake-selectlist-selected-value').textContent = selectedValueText;
   }
 
-  return selectmenu;
+  return selectlist;
 }
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/selectmenu_button_icon.svg b/tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/selectlist_button_icon.svg
similarity index 100%
rename from tests/wpt/tests/html/semantics/forms/the-selectmenu-element/support/selectmenu_button_icon.svg
rename to tests/wpt/tests/html/semantics/forms/the-selectlist-element/support/selectlist_button_icon.svg
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html
deleted file mode 100644
index 3993c139506..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-ask-for-reset.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<title>HTMLSelectMenuElement Test: ask-for-reset</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<form name="fm1" id="form1">
-  <selectmenu id="selectmenu1">
-    <option>one</option>
-    <option>two</option>
-  </selectmenu>
-
-  <selectmenu id="selectmenu2">
-    <option>one</option>
-    <option selected>two</option>
-  </selectmenu>
-
-  <selectmenu id="selectmenu3">
-    <option>one</option>
-    <option selected>two</option>
-    <option selected>three</option>
-  </selectmenu>
-</form>
-
-<script>
-function createSelectMenu(numberOfOptions) {
-  let selectMenu = document.createElement("selectmenu");
-  for (let i = 0; i < numberOfOptions; i++) {
-    let option = document.createElement("option");
-    option.value = i;
-    selectMenu.appendChild(option);
-  }
-  return selectMenu;
-}
-
-function checkSelection(selectMenu, selectedOptionIndex, msg) {
-  for (let i = 0; i < selectMenu.children.length; i++) {
-    if (i != selectedOptionIndex) {
-      assert_false(selectMenu.children[i].selected);
-    }
-  }
-  assert_true(selectMenu.children[selectedOptionIndex].selected, msg);
-  assert_equals(selectMenu.value, selectMenu.children[selectedOptionIndex].value);
-}
-
-test(() => {
-  let selectMenu = createSelectMenu(5);
-
-  selectMenu.children[4].selected = true;
-  checkSelection(selectMenu, 4);
-
-  selectMenu.children[4].remove();
-  checkSelection(selectMenu, 0, "After removing the selected option, selection should default to first option.");
-
-  selectMenu.children[3].selected = true;
-  checkSelection(selectMenu, 3);
-  selectMenu.children[0].remove();
-  checkSelection(selectMenu, 2, "Removing non-selected option should have no effect.");
-}, "ask-for-reset when removing option");
-
-test(() => {
-  let selectMenu = createSelectMenu(3);
-  selectMenu.children[1].selected = true;
-
-  let newOption = document.createElement("option");
-  newOption.selected = true;
-  selectMenu.appendChild(newOption);
-  checkSelection(selectMenu, 3, "Inserting a selected option should update selection.");
-
-  let newOption2 = document.createElement("option");
-  newOption2.selected = true;
-  selectMenu.prepend(newOption2);
-  checkSelection(selectMenu, 0, "Inserting a selected option should update selection, even though it's not last in tree order.");
-
-  let newOption3 = document.createElement("option");
-  selectMenu.appendChild(newOption3);
-  checkSelection(selectMenu, 0, "Inserting a non-selected option should have no effect.");
-}, "ask-for-reset when inserting option");
-
-test(() => {
-  let selectMenu = createSelectMenu(3);
-  let options = selectMenu.children;
-
-  // select options from first to last
-  for (let i = 0; i < options.length; i++) {
-    options[i].selected = true;
-    checkSelection(selectMenu, i);
-  }
-
-  // select options from last to first
-  for (let i = options.length - 1; i >= 0; i--) {
-    options[i].selected = true;
-    checkSelection(selectMenu, i);
-  }
-
-  options[2].selected = true;
-  checkSelection(selectMenu, 2);
-  options[2].selected = false;
-  checkSelection(selectMenu, 0, "First non-disabled option should be selected.");
-
-  options[0].disabled = true;
-  options[2].selected = true;
-  checkSelection(selectMenu, 2);
-  options[2].selected = false;
-  checkSelection(selectMenu, 1, "First non-disabled option should be selected.");
-}, "ask-for-reset when changing selectedness of option");
-
-test(() => {
-  let selectMenu1 = document.getElementById("selectmenu1");
-  let selectMenu2 = document.getElementById("selectmenu2");
-  let selectMenu3 = document.getElementById("selectmenu3");
-
-  document.getElementById("form1").reset();
-
-  assert_equals(selectMenu1.value, "one", "First non-disabled option should be selected.");
-  assert_equals(selectMenu2.value, "two", "The selected option should be selected.");
-  assert_equals(selectMenu3.value, "three", "Last selected option should be selected.")
-}, "ask-for-reset for form");
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size-ref.tentative.html
deleted file mode 100644
index 53296f6daac..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size-ref.tentative.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('option');
-  document.body.appendChild(selectmenu);
-  selectmenu.style.width = "400px";
-  selectmenu.style.height = "50px";
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html
deleted file mode 100644
index 8c09f6c8896..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-explicit-size.tentative.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<!-- Tests that selectmenu respects explicit size -->
-<link rel=author href="mailto:pkotwicz@chromium.org">
-<link rel="match" href="selectmenu-explicit-size-ref.tentative.html">
-
-<style>
-selectmenu {
-  width:400px;
-  height:50px;
-}
-</style>
-<selectmenu>
-  <option>option</option>
-</selectmenu>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size-ref.tentative.html
deleted file mode 100644
index a01455aab09..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size-ref.tentative.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('option');
-  document.body.appendChild(selectmenu);
-  selectmenu.style.fontSize = "48px";
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html
deleted file mode 100644
index 4a4d129cb94..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-font-size.tentative.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<!-- Tests that selectmenu respects explicit size -->
-<link rel=author href="mailto:pkotwicz@chromium.org">
-<link rel="match" href="selectmenu-font-size-ref.tentative.html">
-
-<style>
-selectmenu {
-  font-size:48px;
-}
-</style>
-<selectmenu>
-  <option>option</option>
-</selectmenu>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html
deleted file mode 100644
index 9f937d7b700..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-keyboard.tentative.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!doctype html>
-<title>HTMLSelectMenuElement Test: keyboard accessibility</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>
-  <selectmenu id="selectMenu0">
-    <div id="selectMenu0-button0" slot="button" behavior="button" tabindex="0">button</div>
-    <option>one</option>
-    <option>two</option>
-    <option>three</option>
-  </selectmenu>
-
-  <selectmenu id="selectMenu1">
-    <option id="selectMenu1-child0">one</option>
-  </selectmenu>
-
-  <selectmenu id="selectMenu2" disabled>
-    <div id="selectMenu2-button0" slot="button" behavior="button" tabindex="0">button</div>
-    <option disabled>one</option>
-    <option>two</option>
-    <option>three</option>
-  </selectmenu>
-
-  <selectmenu id="selectMenu3">
-    <div id="selectMenu3-button0" slot="button" behavior="button" tabindex="0">button</div>
-    <option>one</option>
-    <option disabled>two</option>
-    <option>three</option>
-  </selectmenu>
-<script>
-// See https://w3c.github.io/webdriver/#keyboard-actions
-const KEY_CODE_MAP = {
-  'Enter':      '\uE007',
-  'Space':      '\uE00D',
-  'ArrowUp':    '\uE013',
-  'ArrowDown':  '\uE015'
-};
-
-function clickOn(element) {
-    const actions = new test_driver.Actions();
-    return actions.pointerMove(0, 0, {origin: element})
-      .pointerDown({button: actions.ButtonType.LEFT})
-      .pointerUp({button: actions.ButtonType.LEFT})
-      .send();
-  }
-
-promise_test(async t => {
-  const selectMenu = document.querySelector("#selectMenu0");
-  const button = document.querySelector("#selectMenu0-button0");
-  assert_false(selectMenu.open, "selectmenu should not be initially open");
-
-  await test_driver.send_keys(button, KEY_CODE_MAP.Enter);
-  assert_true(selectMenu.open, "Enter key should open selectmenu");
-  assert_equals(selectMenu.value, "one");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
-  assert_equals(selectMenu.value, "two", "Down arrow should go to next option");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
-  assert_equals(selectMenu.value, "three", "Down arrow should go to next option");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowDown);
-  assert_equals(selectMenu.value, "three", "Down arrow should do nothing if already at the last option");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowUp);
-  assert_equals(selectMenu.value, "two", "Up arrow should go to the previous option");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowUp);
-  assert_equals(selectMenu.value, "one", "Up arrow should go to the previous option");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.ArrowUp);
-  assert_equals(selectMenu.value, "one", "Up arrow should do nothing if already at the first option");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-  assert_false(selectMenu.open, "Enter key should close selectmenu");
-
-  await test_driver.send_keys(selectMenu, " ");
-  assert_true(selectMenu.open, "Space key should open selectmenu");
-
-  // This behavior is suspicious (since Space key can open the selectmenu),
-  // but it maches <select>. See https://github.com/openui/open-ui/issues/386
-  await test_driver.send_keys(selectMenu, " ");
-  assert_true(selectMenu.open, "Space key should *not* close selectmenu");
-
-  await test_driver.send_keys(selectMenu, KEY_CODE_MAP.Enter);
-  assert_false(selectMenu.open, "Enter key should close selectmenu");
-}, "Validate Enter, Up/Down Arrow, and Space keyboard accessibility support for <selectmenu>");
-
-promise_test(async t => {
-  const selectMenuOption = document.getElementById("selectMenu1-child0");
-  const event = document.createEvent("Event");
-  event.initEvent("keydown");
-  selectMenuOption.dispatchEvent(event);
-}, "Firing a synthetic event at a selectmenu's option doesn't crash");
-
-promise_test(async t => {
-  const selectMenu2 = document.querySelector("#selectMenu2");
-  const selectMenu2Button = document.querySelector("#selectMenu2-button0");
-  assert_false(selectMenu2.open, "selectmenu should not be initially open");
-
-  await test_driver.send_keys(selectMenu2Button, KEY_CODE_MAP.Enter);
-  assert_false(selectMenu2.open, "Enter key should not open a disabled selectmenu");
-  await clickOn(selectMenu2);
-  assert_false(selectMenu2.open, "Click should not open a disabled selectmenu");
-  assert_equals(selectMenu2.value, "one");
-
-  const selectMenu3 = document.querySelector("#selectMenu3");
-  const selectMenu3Button = document.querySelector("#selectMenu3-button0");
-  assert_false(selectMenu3.open, "selectmenu should not be initially open");
-
-  await test_driver.send_keys(selectMenu3Button, KEY_CODE_MAP.Enter);
-  assert_true(selectMenu3.open, "Enter key should open selectmenu");
-  assert_equals(selectMenu3.value, "one");
-
-  await test_driver.send_keys(selectMenu3, KEY_CODE_MAP.ArrowDown);
-  assert_equals(selectMenu3.value, "three", "Down arrow should go to next non-disabled option");
-
-  await test_driver.send_keys(selectMenu3, KEY_CODE_MAP.ArrowUp);
-  assert_equals(selectMenu3.value, "one", "Up arrow should go to the previous non-disabled option");
-}, "Validate Enter, Up/Down Arrow keyboard accessibility support for disabled <selectmenu>");
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html
deleted file mode 100644
index 6f940432999..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-labels.tentative.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<title>HTMLSelectMenuElement Test: labels</title>
-<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<label id="label1" for="selectmenu1">Label 1</label>
-<selectmenu id="selectmenu1">
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-  <option>four</option>
-</selectmenu>
-<label id="label2" for="selectmenu1">Label 2</label>
-<label id="label3" for="invalid-selectmenu1">Label 3</label>
-
-<script>
-
-test(() => {
-  let selectMenu = document.getElementById("selectmenu1");
-
-  assert_true(selectMenu.labels instanceof NodeList);
-  assert_equals(selectMenu.labels.length, 2);
-  assert_equals(selectMenu.labels[0], document.getElementById("label1"));
-  assert_equals(selectMenu.labels[1], document.getElementById("label2"));
-}, "Validate selectmenu.labels");
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html
deleted file mode 100644
index cec447509eb..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-part-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('hello world');
-  document.body.appendChild(selectmenu);
-  selectmenu.querySelector('.fake-selectmenu-internal-selectmenu-button-icon')
-    .style.backgroundColor = 'red';
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html
deleted file mode 100644
index 54bdefb7619..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-marker-slot-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('hello world');
-  document.body.appendChild(selectmenu);
-
-  const oldMarker = selectmenu.querySelector('.fake-selectmenu-internal-selectmenu-button-icon');
-  const newMarker = document.createElement('div');
-  newMarker.textContent = 'marker';
-
-  replaceChildElement(newMarker, oldMarker);
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html
deleted file mode 100644
index 08c283322d5..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-parts-structure.tentative.html
+++ /dev/null
@@ -1,530 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<title>HTMLSelectMenuElement Test: part structure</title>
-<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<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>
-
-<selectmenu id="selectMenu0">
-  <div popover slot="listbox" behavior="listbox">
-    <option id="selectMenu0-child1">one</option>
-    <option id="selectMenu0-child2">two</option>
-    <div behavior="option" id="selectMenu0-child3">three</div>
-  </div>
-  <option id="selectMenu0-child4">four</option>
-</selectmenu>
-
-<selectmenu id="selectMenu1">
-  <div popover slot="listbox" behavior="listbox" id="selectMenu1-popover">
-    <div behavior="button" id="selectMenu1-button">
-      Custom button
-    </div>
-    <option>one</option>
-    <option id="selectMenu1-child2">two</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu2">
-  <div slot="button" behavior="button" id="selectMenu2-button">
-    Custom button
-    <div popover behavior="listbox" id="selectMenu2-popover">
-      <option>one</option>
-      <option id="selectMenu2-child2">two</option>
-    </div>
-  </div>
-  <option>three</option>
-  <div>
-    This is some text.
-    <option id="selectMenu2-child4">four</option>
-    More text.
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu3">
-  <div slot="button" id="selectMenu3-button-slot">
-    <div behavior="button" id="selectMenu3-button0">button0</div>
-  </div>
-  <option>one</option>
-</selectmenu>
-
-<selectmenu id="selectMenu4">
-  <div slot="button" behavior="button" id="selectMenu4-button0">button0</div>
-  <div slot="listbox" id="selectMenu4-listbox-slot">
-    <div popover behavior="listbox" id="selectMenu4-listbox0">
-      <option>one</option>
-      <option id="selectMenu4-option2">two</option>
-    </div>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu5">
-  <div slot="button" id="selectMenu5-button-slot">
-    <div behavior="button" id="selectMenu5-button0">button0</div>
-    <div behavior="selected-value" id="selectMenu5-selectedValue0"></div>
-  </div>
-  <option>one</option>
-  <option id="selectMenu5-option0">two</option>
-</selectmenu>
-
-<!-- No associated JS test -- just don't crash when parsing! -->
-<selectmenu id="selectMenu6">
-  <div slot="button"></div>
-  <div popover slot="listbox" behavior="listbox"></div>
-</selectmenu>
-
-<!-- No associated JS test -- just don't crash when parsing! -->
-<selectmenu id="selectMenu7">
-  <div slot="listbox"></div>
-  <div slot="button" behavior="button"></div>
-</selectmenu>
-
-<!-- No associated JS test -- just don't crash when parsing! -->
-<selectmenu id="selectMenu8">
-  <div slot="listbox"></div>
-  <option>one</option>
-</selectmenu>
-
-<selectmenu id="selectMenu9">
-  <div slot="listbox" id="selectMenu9-listbox-slot">
-    <div popover behavior="listbox" id="selectMenu9-originalListbox">
-      <option>one</option>
-      <option id="selectMenu9-option2">two</option>
-    </div>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu10">
-  <option slot="button" id="selectMenu10-slottedOption">Test 10</option>
-  <option>one</option>
-  <option id="selectMenu10-option2">two</option>
-</selectmenu>
-
-<selectmenu id="selectMenu11">
-  <div popover slot="listbox" behavior="listbox">
-    <option>one</option>
-  </div>
-  <div slot="button" behavior="listbox" id="selectMenu11-button">Test</div>
-</selectmenu>
-
-<selectmenu id="selectMenu12">
-  <div slot="button" id="selectMenu12-button-slot">
-    <div behavior="button" id="selectMenu12-button0">button0</div>
-  </div>
-  <div slot="listbox" id="selectMenu12-listbox-slot">
-    <div popover behavior="listbox" id="selectMenu12-originalListbox">
-      <option id="selectMenu12-option1">one</option>
-      <option>two</option>
-    </div>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu13">
-  <div slot="button" id="selectMenu12-button-slot">
-    <div id="selectMenu13-removeContent-button">
-      <div behavior="button" id="selectMenu13-button0">button0</div>
-      <div behavior="button" id="selectMenu13-button1">button1</div>
-    </div>
-    <div behavior="button" id="selectMenu13-button2">button2</div>
-  </div>
-  <div slot="listbox" id="selectMenu13-listbox-slot">
-    <div id="selectMenu13-removeContent-listbox">
-      <div popover behavior="listbox" id="selectMenu13-originalListbox">
-        <option id="selectMenu13-option1">one</option>
-        <option id="selectMenu13-option2">two</option>
-      </div>
-    </div>
-    <div popover behavior="listbox" id="selectMenu13-newListbox">
-      <option>three</option>
-      <option id="selectMenu13-option4">four</option>
-    </div>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu14">
-  <div slot="button" behavior="button" id="selectMenu14-button0">button0</div>
-  <option>one</option>
-  <option id="selectMenu14-option2">two</option>
-</selectmenu>
-
-<selectmenu id="selectMenu15">
-  <div slot="button" id="selectMenu15-div0"></div>
-  <option>one</option>
-</selectmenu>
-
-<selectmenu id="selectMenu16">
-  <div slot="button">
-    <div id="selectMenu16-div0">
-      <div behavior="button" id="selectMenu16-button0">button</div>
-    </div>
-  </div>
-  <option>one</option>
-</selectmenu>
-
-<script>
-  function clickOn(element) {
-    const actions = new test_driver.Actions();
-    return actions.pointerMove(0, 0, {origin: element})
-      .pointerDown({button: actions.ButtonType.LEFT})
-      .pointerUp({button: actions.ButtonType.LEFT})
-      .send();
-  }
-
-  promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
-    const selectMenu0Child1 = document.getElementById("selectMenu0-child1");
-    const selectMenu0Child2 = document.getElementById("selectMenu0-child2");
-    const selectMenu0Child3 = document.getElementById("selectMenu0-child3");
-    assert_equals(selectMenu0.value, "one");
-    await clickOn(selectMenu0);
-    await clickOn(selectMenu0Child2);
-    assert_equals(selectMenu0.value, "two");
-
-    await clickOn(selectMenu0);
-    await clickOn(selectMenu0Child3);
-    assert_equals(selectMenu0.value, "two", "Clicking a non-HTMLOptionElement labeled as an option should do nothing");
-
-    await clickOn(selectMenu0Child1);
-    assert_equals(selectMenu0.value, "one");
-    assert_false(selectMenu0.open);
-  }, "HTMLOptionElements (and not other element types) should receive option controller code");
-
-
-  promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
-    const selectMenu0Child4 = document.getElementById("selectMenu0-child4");
-
-    assert_equals(selectMenu0.value, "one");
-    await clickOn(selectMenu0);
-    assert_true(selectMenu0.open);
-    selectMenu0Child4.click();
-    assert_equals(selectMenu0.value, "one", "Clicking an option outside of the popover should not change the value");
-  }, "To receive option part controller code, an option must be a descendant of the listbox part in a flat tree traversal");
-
-  promise_test(async () => {
-    const selectMenu1 = document.getElementById("selectMenu1");
-    const selectMenu1Popover = document.getElementById("selectMenu1-popover");
-    const selectMenu1Button = document.getElementById("selectMenu1-button");
-    const selectMenu1Child2 = document.getElementById("selectMenu1-child2");
-    assert_false(selectMenu1Popover.matches(':popover-open'));
-    selectMenu1Button.click();
-    assert_false(selectMenu1Popover.matches(':popover-open'), "Clicking a button part that is a descendant of the listbox part should have no effect");
-
-    assert_equals(selectMenu1.value, "one");
-    await clickOn(selectMenu1);
-    assert_true(selectMenu1Popover.matches(':popover-open'));
-    await clickOn(selectMenu1Child2);
-    assert_equals(selectMenu1.value, "two", "Clicking an <option> should change the value");
-  }, "To receive button part controller code, an element labeled as a button must not be a descendant of the listbox part in a flat tree traversal");
-
-  promise_test(async () => {
-    const selectMenu2 = document.getElementById("selectMenu2");
-    const selectMenu2Popover = document.getElementById("selectMenu2-popover");
-    const selectMenu2Button = document.getElementById("selectMenu2-button");
-    const selectMenu2Child2 = document.getElementById("selectMenu2-child2");
-    const selectMenu2Child4 = document.getElementById("selectMenu2-child4");
-
-    assert_false(selectMenu2Popover.matches(':popover-open'));
-    await clickOn(selectMenu2Button);
-    assert_false(selectMenu2Popover.matches(':popover-open'), "Clicking a button part should not show an invalid listbox part");
-
-    assert_equals(selectMenu2.value, "three");
-    await clickOn(selectMenu2Button);
-    await clickOn(selectMenu2Child4);
-    assert_equals(selectMenu2.value, "four", "Clicking an <option> that is a descendant of a valid listbox part should update the value");
-  }, "To receive listbox part controller code, an element labeled as a listbox must not be a descendant of the button part in a flat tree traversal");
-
-  promise_test(async () => {
-    const selectMenu3 = document.getElementById("selectMenu3");
-    const selectMenu3ButtonSlot = document.getElementById("selectMenu3-button-slot");
-    const selectMenu3Button0 = document.getElementById("selectMenu3-button0");
-
-    assert_false(selectMenu3.open);
-
-    let button1 = document.createElement("div");
-    button1.innerText = "button1";
-    button1.setAttribute("behavior", "button");
-    selectMenu3ButtonSlot.appendChild(button1);
-
-    await clickOn(button1);
-    assert_false(selectMenu3.open, "A button part should only get controller code if it's first in document order, even if added dynamically");
-
-    await clickOn(selectMenu3Button0);
-    assert_true(selectMenu3.open, "A button part should get controller code if it's first in document order");
-  }, "Button controller code should be applied in flat tree traversal order regardless of dynamic insertion order");
-
-  promise_test(async () => {
-    const selectMenu4 = document.getElementById("selectMenu4");
-    const selectMenu4Button0 = document.getElementById("selectMenu4-button0");
-    const selectMenu4ListboxSlot = document.getElementById("selectMenu4-listbox-slot");
-    const selectMenu4Option2 = document.getElementById("selectMenu4-option2");
-
-    assert_false(selectMenu4.open);
-
-    let listbox2 = document.createElement("div");
-    listbox2.innerHTML = `
-      <option>three</option>
-      <option id="selectMenu4-option4">four</option>
-    `;
-    listbox2.setAttribute("behavior", "listbox");
-    selectMenu4ListboxSlot.appendChild(listbox2);
-
-    await clickOn(selectMenu4Button0);
-    assert_true(selectMenu4.open);
-
-    const selectMenu4Option4 = document.getElementById("selectMenu4-option4");
-    await clickOn(selectMenu4Option4);
-    assert_equals(selectMenu3.value, "one", "An option in a listbox should not get controller code if its listbox isn't first in document order, even if added dynamically");
-
-    await clickOn(selectMenu4Button0);
-    assert_true(selectMenu4.open);
-
-    await clickOn(selectMenu4Option2);
-    assert_equals(selectMenu4.value, "two", "An option in a listbox should get controller code if its listbox is first in document order, even if another listbox was added dynamically");
-}, "Listbox controller code should be applied in flat tree traversal order regardless of dynamic insertion order");
-
-promise_test(async () => {
-    const selectMenu5 = document.getElementById("selectMenu5");
-    const selectMenu5ButtonSlot = document.getElementById("selectMenu5-button-slot");
-    const selectMenu5Button0 = document.getElementById("selectMenu5-button0");
-    const selectMenu5SelectedValue0 = document.getElementById("selectMenu5-selectedValue0");
-
-    assert_false(selectMenu3.open);
-    assert_equals(selectMenu5SelectedValue0.innerText, "one");
-
-    let selectedValue1 = document.createElement("div");
-    selectMenu5ButtonSlot.appendChild(selectedValue1);
-
-    await clickOn(selectMenu5Button0);
-    assert_true(selectMenu5.open);
-
-    await clickOn(document.getElementById("selectMenu5-option0"));
-    assert_false(selectMenu5.open);
-    assert_equals(selectMenu5SelectedValue0.innerText, "two", "first selected-value part in flat tree order should get controller code");
-    assert_equals(selectedValue1.innerText, "", "Dynamically inserted selected-value part shouldn't get controller code if it's not first in flat tree order");
-  }, "selected-value controller code should be applied in flat tree traversal order regardless of dynamic insertion order");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu9");
-    const originalListbox = document.getElementById("selectMenu9-originalListbox");
-    const option2 = document.getElementById("selectMenu9-option2");
-    assert_equals(selectMenu.value, "one", "Initial value should be the first option");
-
-    let newListbox = document.createElement("div");
-    newListbox.setAttribute("popover", "auto");
-    newListbox.setAttribute("behavior", "listbox");
-    let newOption = document.createElement("option");
-    newOption.innerText = "three";
-    newListbox.appendChild(newOption);
-    let newOption2 = document.createElement("option");
-    newOption2.innerText = "four";
-    newListbox.appendChild(newOption2);
-    originalListbox.parentElement.insertBefore(newListbox, originalListbox);
-
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open, "Menu should open when clicked");
-
-    option2.click(); // clickOn doesn't work because the old options are not displayed
-    assert_equals(selectMenu.value, "three", "Elements in second popover should no longer be option parts");
-    assert_true(selectMenu.open, "Clicking non-part options shouldn't close the popover");
-
-    await clickOn(newOption2);
-    assert_false(selectMenu.open);
-    assert_equals(selectMenu.value, "four", "New options should get controller code after listbox switch");
-    }, "Ensure that option controller code is updated when listbox changes");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu10");
-    const selectMenu10SlottedOption = document.getElementById("selectMenu10-slottedOption");
-
-    await clickOn(selectMenu10SlottedOption);
-    assert_false(selectMenu.open, "Controller code not applied due to part attribute missing");
-    selectMenu10SlottedOption.setAttribute("behavior", "button");
-    await clickOn(selectMenu10SlottedOption);
-    assert_true(selectMenu.open);
-
-    const option2 = document.getElementById("selectMenu10-option2");
-    await clickOn(option2);
-    assert_equals(selectMenu.value, "two");
-    assert_false(selectMenu.open);
-
-    selectMenu10SlottedOption.slot = "";
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open, "Default button part should be used");
-    await clickOn(selectMenu10SlottedOption);
-    assert_equals(selectMenu.value, "Test 10");
-  }, "Ensure that controller code is applied after updating the slot attribute");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu11");
-    const selectMenu11Button= document.getElementById("selectMenu11-button");
-
-    await clickOn(selectMenu11Button);
-    assert_false(selectMenu.open, "Controller code not applied due to part attribute not being button");
-    selectMenu11Button.remove();
-
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open, "Default button part should be used");
-  }, "Ensure that controller code is applied when slot and part attributes are different");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu12");
-    const originalListbox = document.getElementById("selectMenu12-originalListbox");
-    assert_equals(selectMenu.value, "one", "Initial value should be the first option");
-
-    const selectMenuButtonSlot = document.getElementById("selectMenu12-button-slot");
-    const selectMenuButton0 = document.getElementById("selectMenu12-button0");
-    const selectMenuOption1 = document.getElementById("selectMenu12-option1");
-
-    assert_false(selectMenu.open);
-    let button1 = document.createElement("div");
-    button1.innerText = "button1";
-    button1.setAttribute("behavior", "button");
-    selectMenuButtonSlot.insertBefore(button1, selectMenuButton0);
-    button1.click();
-    assert_true(selectMenu.open, "Controller code should be applied to the new first button in document order");
-    await clickOn(selectMenuOption1);
-    assert_false(selectMenu.open);
-    selectMenuButton0.click();
-    assert_false(selectMenu.open);
-
-    let button2 = document.createElement("div");
-    button2.innerText = "button2";
-    selectMenuButtonSlot.insertBefore(button2, button1);
-    button2.click();
-    assert_false(selectMenu.open, "Controller code should not be applied to button2 since it doesn't have behavior attribute set");
-    button2.setAttribute("behavior", "button");
-    button2.click();
-    assert_true(selectMenu.open, "Controller code should be applied to the new button part");
-    await clickOn(selectMenuOption1);
-    assert_false(selectMenu.open);
-
-    let newListbox = document.createElement("div");
-    newListbox.setAttribute("popover", "auto");
-    newListbox.setAttribute("behavior", "listbox");
-    let newOption = document.createElement("option");
-    newOption.innerText = "three";
-    newListbox.appendChild(newOption);
-    let newOption2 = document.createElement("option");
-    newOption2.innerText = "four";
-    newListbox.appendChild(newOption2);
-    originalListbox.parentElement.insertBefore(newListbox, originalListbox);
-    assert_equals(selectMenu.value, "three", "New value should be the first option");
-
-    newListbox.innerHTML = "<option>five</option><option>six</option>";
-    assert_equals(selectMenu.value, "five", "New value should be the first option");
-
-    selectMenu.innerHTML = "<option>seven</option><option id='selectMenu12-option2'>eight</option>";
-    assert_equals(selectMenu.value, "seven", "New value should be the first option");
-    const selectMenuOption2 = document.getElementById("selectMenu12-option2");
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open);
-    await clickOn(selectMenuOption2);
-    assert_equals(selectMenu.value, "eight", "Controller code should be applied to new options");
-
-    selectMenuOption2.slot = "button";
-    assert_equals(selectMenu.value, "seven", "Previous selected option should become invalid");
-  }, "Ensure that controller code is synchronously applied");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu13");
-    assert_equals(selectMenu.value, "one");
-
-    const selectMenuButton0 = document.getElementById("selectMenu13-button0");
-    const selectMenuButton1 = document.getElementById("selectMenu13-button1");
-    selectMenuButton1.click();
-    assert_false(selectMenu.open);
-    selectMenuButton0.click();
-    assert_true(selectMenu.open, "First button should receive controller code");
-    await clickOn(document.getElementById("selectMenu13-option2"));
-    assert_equals(selectMenu.value, "two");
-    let divButtonToRemove = document.getElementById("selectMenu13-removeContent-button");
-    divButtonToRemove.innerHTML = "";
-    selectMenuButton0.click();
-    assert_false(selectMenu.open, "The first button is invalid");
-    const selectMenuButton2 = document.getElementById("selectMenu13-button2");
-    selectMenuButton2.click();
-    assert_true(selectMenu.open, "The button part should be updated")
-    await clickOn(document.getElementById("selectMenu13-option1"));
-    assert_equals(selectMenu.value, "one");
-
-    const selectMenuOption4 = document.getElementById("selectMenu13-option4");
-    selectMenuOption4.click();
-    assert_equals(selectMenu.value, "one");
-    let divListboxToRemove = document.getElementById("selectMenu13-removeContent-listbox");
-    divListboxToRemove.innerHTML = "";
-    assert_equals(selectMenu.value, "three", "The listbox part should be updated");
-    selectMenuOption4.click();
-    assert_equals(selectMenu.value, "four", "Controller code should be applied to the new options");
-
-    let selectMenuNewListbox = document.getElementById("selectMenu13-newListbox");
-    selectMenuNewListbox.innerHTML = "";
-    assert_equals(selectMenu.value, "");
-    selectMenuOption4.click();
-    assert_equals(selectMenu.value, "");
-  }, "Controller code should be updated when nested parts are removed");
-
-  promise_test(async () => {
-    let selectMenu = document.getElementById("selectMenu14");
-    assert_equals(selectMenu.value, "one");
-    const selectMenuButton0 = document.getElementById("selectMenu14-button0");
-    const selectMenuOption2 = document.getElementById("selectMenu14-option2");
-
-    selectMenuButton0.click();
-    assert_true(selectMenu.open);
-    await clickOn(selectMenuOption2);
-    assert_equals(selectMenu.value, "two");
-
-    document.body.removeChild(selectMenu);
-    selectMenu.removeChild(selectMenuOption2);
-    assert_equals(selectMenu.value, "one");
-    let newOption = document.createElement("option");
-    newOption.innerText = "three";
-    selectMenu.appendChild(newOption);
-    newOption.click();
-    assert_equals(selectMenu.value, "three", "New option should receive controller code");
-
-    let doc = document.implementation.createHTMLDocument('');
-    let selectMenu1 = doc.createElement('selectmenu');
-    let firstOption = doc.createElement('option');
-    firstOption.innerText = 'one';
-    let secondOption = doc.createElement('option');
-    secondOption.innerText = 'two';
-    selectMenu1.appendChild(firstOption);
-    selectMenu1.appendChild(secondOption);
-    assert_equals(selectMenu1.value, "one");
-    secondOption.click();
-    assert_equals(selectMenu1.value, "two");
-    document.body.appendChild(selectMenu1);
-    selectMenu1.removeChild(secondOption);
-    assert_equals(selectMenu1.value, "one");
-  }, "Moving a selectmenu between documents should keep controller code active");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu15");
-    const selectMenuButtonContainer = document.getElementById("selectMenu15-div0");
-
-    const outerDiv = document.createElement("div");
-    const button = document.createElement("input");
-    button.type = button.value = "button";
-    button.setAttribute("behavior", "button");
-    outerDiv.appendChild(button);
-    selectMenuButtonContainer.appendChild(outerDiv);
-
-    await clickOn(selectMenu);
-    assert_true(selectMenu.open, "New button should receive controller code");
-  }, "New parts should be detected even when in the subtree of an inserted node");
-
-  promise_test(async () => {
-    const selectMenu = document.getElementById("selectMenu16");
-    const selectMenuButtonContainer = document.getElementById("selectMenu16-div0");
-    const selectMenuButton = document.getElementById("selectMenu16-button0");
-
-    selectMenuButtonContainer.remove();
-
-    selectMenuButton.click();
-    assert_false(selectMenu.open, "Removed button should no longer have controller code");
-  }, "Part removals should be detected even when in the subtree of a removed node");
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html
deleted file mode 100644
index 85d73d6a407..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position-with-zoom.tentative.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html>
-<title>HTMLSelectMenuElement Test: popover position with zoom</title>
-<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<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>
-  #selectMenu0 {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    zoom: 2;
-  }
-
-  #selectMenu1 {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-    zoom: 1.5;
-  }
-
-  #selectMenu1-popover {
-    zoom: 2;
-  }
-
-  #selectMenu2 {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    zoom: 3;
-  }
-
-  #selectMenu3 {
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-    zoom: 4;
-  }
-
-  #selectMenu3-popover {
-    zoom: 1.5;
-  }
-</style>
-
-<selectmenu id="selectMenu0">
-  <div slot="button" behavior="button" id="selectMenu0-button">Custom bottom left</div>
-  <div popover slot="listbox" behavior="listbox" id="selectMenu0-popover">
-    <option>bottom left</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-<br>
-
-<selectmenu id="selectMenu1">
-  <div slot="button" behavior="button" id="selectMenu1-button">Custom top left</div>
-  <div popover slot="listbox" behavior="listbox" id="selectMenu1-popover">
-    <option>top left</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu2">
-  <div slot="button" behavior="button" id="selectMenu2-button">Custom bottom right</div>
-  <div popover slot="listbox" behavior="listbox" id="selectMenu2-popover">
-    <option>bottom right</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu3">
-  <div slot="button" behavior="button" id="selectMenu3-button">Custom top right</div>
-  <div popover slot="listbox" behavior="listbox" id="selectMenu3-popover">
-    <option>top right</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-
-<script>
-  function clickOn(element) {
-    const actions = new test_driver.Actions();
-    return actions.pointerMove(0, 0, {origin: element})
-      .pointerDown({button: actions.ButtonType.LEFT})
-      .pointerUp({button: actions.ButtonType.LEFT})
-      .send();
-  }
-
-  promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
-    const selectMenu0Popover = document.getElementById("selectMenu0-popover");
-    const selectMenu0Button = document.getElementById("selectMenu0-button");
-
-    await clickOn(selectMenu0);
-    assert_equals(Math.abs(Math.trunc(selectMenu0.getBoundingClientRect().bottom - selectMenu0Popover.getBoundingClientRect().top)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu0.getBoundingClientRect().left - selectMenu0Popover.getBoundingClientRect().left)), 0);
-  }, "The popover should be bottom left positioned");
-
-  promise_test(async () => {
-    const selectMenu1 = document.getElementById("selectMenu1");
-    const selectMenu1Popover = document.getElementById("selectMenu1-popover");
-    const selectMenu1Button = document.getElementById("selectMenu1-button");
-
-    selectMenu1Button.click();
-    assert_equals(Math.abs(Math.trunc(selectMenu1.getBoundingClientRect().top - selectMenu1Popover.getBoundingClientRect().bottom * 2)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu1.getBoundingClientRect().left - selectMenu1Popover.getBoundingClientRect().left * 2)), 0);
-  }, "The popover should be top left positioned");
-
-  promise_test(async () => {
-    const selectMenu2 = document.getElementById("selectMenu2");
-    const selectMenu2Popover = document.getElementById("selectMenu2-popover");
-    const selectMenu2Button = document.getElementById("selectMenu2-button");
-
-    selectMenu2Button.click();
-    assert_equals(Math.abs(Math.trunc(selectMenu2.getBoundingClientRect().bottom - selectMenu2Popover.getBoundingClientRect().top)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu2.getBoundingClientRect().right - selectMenu2Popover.getBoundingClientRect().right)), 0);
-  }, "The popover should be bottom right positioned");
-
-  promise_test(async () => {
-    const selectMenu3 = document.getElementById("selectMenu3");
-    const selectMenu3Popover = document.getElementById("selectMenu3-popover");
-    const selectMenu3Button = document.getElementById("selectMenu3-button");
-
-    selectMenu3Button.click();
-    assert_equals(Math.abs(Math.trunc(selectMenu3.getBoundingClientRect().top - selectMenu3Popover.getBoundingClientRect().bottom * 1.5)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu3.getBoundingClientRect().right - selectMenu3Popover.getBoundingClientRect().right * 1.5)), 0);
-  }, "The popover should be top right positioned");
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html
deleted file mode 100644
index d83015f4efd..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover-position.tentative.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html>
-<title>HTMLSelectMenuElement Test: popover position</title>
-<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<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>
-  #selectMenu0 {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-  }
-
-  #selectMenu1 {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
-  }
-
-  #selectMenu2 {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-  }
-
-  #selectMenu3 {
-    position: absolute;
-    bottom: 0px;
-    right: 0px;
-  }
-</style>
-
-<selectmenu id="selectMenu0">
-  <div popover slot="listbox" behavior="listbox" id="selectMenu0-popover">
-    <option>bottom left</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-<br>
-
-<selectmenu id="selectMenu1">
-  <div popover slot="listbox" behavior="listbox" id="selectMenu1-popover">
-    <option>top left</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu2">
-  <div popover slot="listbox" behavior="listbox" id="selectMenu2-popover">
-    <option>bottom right</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu3">
-  <div popover slot="listbox" behavior="listbox" id="selectMenu3-popover">
-    <option>top right</option>
-    <option>two</option>
-    <option>three</option>
-  </div>
-</selectmenu>
-
-<script>
-  function clickOn(element) {
-    const actions = new test_driver.Actions();
-    return actions.pointerMove(0, 0, {origin: element})
-      .pointerDown({button: actions.ButtonType.LEFT})
-      .pointerUp({button: actions.ButtonType.LEFT})
-      .send();
-  }
-
-  promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
-    const selectMenu0Popover = document.getElementById("selectMenu0-popover");
-
-    await clickOn(selectMenu0);
-    assert_equals(Math.abs(Math.trunc(selectMenu0.getBoundingClientRect().bottom - selectMenu0Popover.getBoundingClientRect().top)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu0.getBoundingClientRect().left - selectMenu0Popover.getBoundingClientRect().left)), 0);
-  }, "The popover should be bottom left positioned");
-
-  promise_test(async () => {
-    const selectMenu1 = document.getElementById("selectMenu1");
-    const selectMenu1Popover = document.getElementById("selectMenu1-popover");
-
-    await clickOn(selectMenu1);
-    assert_equals(Math.abs(Math.trunc(selectMenu1.getBoundingClientRect().top - selectMenu1Popover.getBoundingClientRect().bottom)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu1.getBoundingClientRect().left - selectMenu1Popover.getBoundingClientRect().left)), 0);
-  }, "The popover should be top left positioned");
-
-  promise_test(async () => {
-    const selectMenu2 = document.getElementById("selectMenu2");
-    const selectMenu2Popover = document.getElementById("selectMenu2-popover");
-
-    await clickOn(selectMenu2);
-    assert_equals(Math.abs(Math.trunc(selectMenu2.getBoundingClientRect().bottom - selectMenu2Popover.getBoundingClientRect().top)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu2.getBoundingClientRect().right - selectMenu2Popover.getBoundingClientRect().right)), 0);
-  }, "The popover should be bottom right positioned");
-
-  promise_test(async () => {
-    const selectMenu3 = document.getElementById("selectMenu3");
-    const selectMenu3Popover = document.getElementById("selectMenu3-popover");
-
-    await clickOn(selectMenu3);
-    assert_equals(Math.abs(Math.trunc(selectMenu3.getBoundingClientRect().top - selectMenu3Popover.getBoundingClientRect().bottom)), 0);
-    assert_equals(Math.abs(Math.trunc(selectMenu3.getBoundingClientRect().right - selectMenu3Popover.getBoundingClientRect().right)), 0);
-  }, "The popover should be top right positioned");
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html
deleted file mode 100644
index 74aa4f828c3..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-popover.tentative.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<title>HTMLSelectMenuElement Test: popover</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>
-
-<selectmenu id="selectMenu0">
-  <option>one</option>
-  <option id="selectMenu0-child2">two</option>
-  <div id="selectMenu0-child3">I'm a div with no part attr</div>
-  <option>three</option>
-  <option>four</option>
-</selectmenu>
-
-<selectmenu id="selectMenu1">
-  <div slot="button" behavior="button" class="button">
-    Custom button
-  </div>
-  <div popover slot="listbox" behavior="listbox">
-    <option>one</option>
-    <option class="child2">two</option>
-    <option class="child3">three</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu2">
-  <!-- Swap out the listbox part without providing a replacement -->
-  <div slot="listbox"></div>
-</selectmenu>
-
-<selectmenu id="selectMenu3">
-  <div slot="listbox">
-    <div popover behavior="listbox" id="selectMenu3-listbox">
-      <option>one</option>
-    </div>
-  </div>
-</selectmenu>
-<script>
-
-  function clickOn(element) {
-    const actions = new test_driver.Actions();
-    return actions.pointerMove(0, 0, {origin: element})
-      .pointerDown({button: actions.ButtonType.LEFT})
-      .pointerUp({button: actions.ButtonType.LEFT})
-      .send();
-  }
-
-  promise_test(async () => {
-    const selectMenu0 = document.getElementById("selectMenu0");
-    const selectMenu0Child2 = document.getElementById("selectMenu0-child2");
-    const selectMenu0Child3 = document.getElementById("selectMenu0-child3");
-    assert_equals(selectMenu0.value, "one");
-    assert_equals(selectMenu0.open, false);
-    await clickOn(selectMenu0);
-    assert_equals(selectMenu0.open, true);
-    await clickOn(selectMenu0Child2);
-    assert_equals(selectMenu0.value, "two");
-    assert_equals(selectMenu0.open, false);
-
-    await clickOn(selectMenu0);
-    assert_equals(selectMenu0.open, true);
-    await clickOn(selectMenu0Child3);
-    assert_equals(selectMenu0.value, "two", "Clicking a non-option should not change the value");
-    assert_equals(selectMenu0.open, true);
-    await clickOn(selectMenu0Child2);
-    assert_equals(selectMenu0.open, false);
-  }, "Opening the popover and clicking an option should change the selectmenu's value");
-
-  promise_test(async () => {
-    const selectMenu1 = document.getElementById("selectMenu1");
-    const button = selectMenu1.querySelector(".button");
-    const child2 = selectMenu1.querySelector(".child2");
-    const child3 = selectMenu1.querySelector(".child3");
-    assert_equals(selectMenu1.value, "one");
-    assert_equals(selectMenu1.open, false);
-    await clickOn(button);
-    assert_equals(selectMenu1.open, true);
-    await clickOn(child2);
-    assert_equals(selectMenu1.value, "two", "Clicking an <option> should change the value");
-    assert_equals(selectMenu1.open, false);
-
-    await clickOn(button);
-    assert_equals(selectMenu1.open, true);
-    await clickOn(child3);
-    assert_equals(selectMenu1.value, "three", "Clicking a <div part='option'> should change the value");
-    assert_equals(selectMenu1.open, false);
-  }, "With custom button and popover: opening the popover and clicking an option should change the selectmenu's value");
-
-  promise_test(async () => {
-    const selectMenu2 = document.getElementById("selectMenu2");
-    await clickOn(selectMenu2);
-    assert_equals(selectMenu2.value, "");
-    assert_equals(selectMenu2.open, false);
-  }, "Clicking a popover with no listbox part does nothing");
-
-  promise_test(async () => {
-    const selectMenu3 = document.getElementById("selectMenu3");
-    const selectMenu3Listbox = document.getElementById("selectMenu3-listbox");
-    selectMenu3Listbox.remove();
-
-    await clickOn(selectMenu3);
-    assert_equals(selectMenu3.value, "");
-    assert_equals(selectMenu3.open, false);
-  }, "Clicking a popover with a listbox that was removed does nothing");
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html
deleted file mode 100644
index dfbab93de82..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-light-dismiss-invalidation.tentative.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<link rel=author href="mailto:jarhar@chromium.org">
-<link rel=help href="http://crbug.com/1429839">
-<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>
-
-<selectmenu id=selectmenu>
-  <option id=optone>one</option>
-  <option id=opttwo>two</option>
-</selectmenu>
-<style>
-selectmenu {
-  background-color: rgb(0, 0, 255);
-}
-selectmenu:closed {
-  background-color: rgb(0, 255, 0);
-}
-selectmenu:open {
-  background-color: rgb(255, 0, 0);
-}
-</style>
-<button id=button>hello world</button>
-
-<script>
-promise_test(async () => {
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(0, 255, 0)',
-    'The selectmenu should match :closed at the start of the test.');
-
-  await test_driver.click(selectmenu);
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(255, 0, 0)',
-    'The selectmenu should match :open when opened.');
-
-  await test_driver.click(opttwo);
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(0, 255, 0)',
-    'The selectmenu should match :closed after clicking an option.');
-
-  await test_driver.click(selectmenu);
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(255, 0, 0)',
-    'The selectmenu should match :open when reopened.');
-
-  await test_driver.click(button);
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(0, 255, 0)',
-    'The selectmenu should match :closed after light dismiss.');
-}, 'selectmenu should not match :open when light dismissed.');
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html
deleted file mode 100644
index b1400e04265..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-pseudo-open-closed.tentative.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<link rel=author href="mailto:jarhar@chromium.org">
-<link rel=help href="https://github.com/openui/open-ui/issues/547">
-<link rel=help href="https://drafts.csswg.org/selectors/#open-state">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<selectmenu id=myselectmenu>
-  <button id=custombutton slot=button behavior=button>button</button>
-  <option>one</option>
-  <option>two</option>
-</selectmenu>
-
-<script>
-test(() => {
-  assert_false(myselectmenu.matches(':open'),
-    'Selectmenu should not match :open while it is closed.');
-  assert_true(myselectmenu.matches(':closed'),
-    'Selectmenu should match :closed while it is closed.');
-
-  custombutton.click();
-
-  assert_true(myselectmenu.matches(':open'),
-    'Selectmenu should match :open while it is open.');
-  assert_false(myselectmenu.matches(':closed'),
-    'Selectmenu should not match :closed while it is open.');
-}, 'Selectmenu should support :open and :closed pseudo selectors.');
-</script>
-
-<selectmenu id=selectmenuinvalidation>
-  <button slot=button behavior=button>button</button>
-  <option>one</option>
-  <option>two</option>
-</selectmenu>
-<style>
-selectmenu:closed {
-  background-color: red;
-}
-selectmenu:open {
-  background-color: green;
-}
-</style>
-
-<script>
-test(() => {
-  const selectmenu = document.getElementById('selectmenuinvalidation');
-  const button = selectmenu.querySelector('button');
-  const option = selectmenu.querySelector('option');
-
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(255, 0, 0)',
-    'The style rules from :closed should apply when the selectmenu is closed.');
-
-  button.click();
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(0, 128, 0)',
-    'The style rules from :open should apply when the selectmenu is open.');
-
-  option.click();
-  assert_equals(getComputedStyle(selectmenu).backgroundColor, 'rgb(255, 0, 0)',
-    'The style rules from :closed should apply when the selectmenu is opened and closed again.');
-}, 'Selectmenu :open and :closed should invalidate correctly.');
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl-ref.tentative.html
deleted file mode 100644
index 42b2541fd51..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-rtl-ref.tentative.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('option');
-  document.body.appendChild(selectmenu);
-  selectmenu.style.direction = "rtl";
-  selectmenu.style.width = "300px";
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html
deleted file mode 100644
index bf468c5516c..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-behavior-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('hello world');
-  document.body.appendChild(selectmenu);
-  selectmenu.querySelector('.fake-selectmenu-selected-value')
-    .style.color = 'blue';
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html
deleted file mode 100644
index 744846b5511..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-part-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('hello world');
-  document.body.appendChild(selectmenu);
-  selectmenu.querySelector('.fake-selectmenu-selected-value')
-    .style.backgroundColor = 'red';
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html
deleted file mode 100644
index 3b322bf7915..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-selected-value-slot-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<script src="support/fake-selectmenu.js"></script>
-<body>
-<script>
-  const selectmenu = createFakeSelectmenu('hello world');
-  document.body.appendChild(selectmenu);
-
-  const oldSelectedValue = selectmenu.querySelector('.fake-selectmenu-selected-value');
-  const newSelectedValue = document.createElement('div');
-  newSelectedValue.textContent = 'new selected value';
-
-  replaceChildElement(newSelectedValue, oldSelectedValue);
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html
deleted file mode 100644
index a58fe54ff6a..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-validity.tentative.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<title>HTMLSelectMenuElement Test: validity</title>
-<link rel="author" title="Ionel Popescu" href="mailto:iopopesc@microsoft.com">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<selectmenu id="selectmenu1" required>
-  <option>one</option>
-  <option>two</option>
-  <option>three</option>
-  <option>four</option>
-</selectmenu>
-
-<form>
-  <selectmenu id="selectmenu2" required>
-  </selectmenu>
-</form>
-
-<script>
-
-test(() => {
-  let selectMenu = document.createElement('selectmenu');
-  assert_true(selectMenu.willValidate, "A selectmenu element is a submittable element that is a candidate for constraint validation.");
-  let option = document.createElement('option');
-  selectMenu.appendChild(option);
-  assert_true(selectMenu.checkValidity(), "Always valid when the selectmenu isn't a required value.");
-
-  selectMenu.required = true;
-  assert_equals(selectMenu.value, "");
-  assert_false(selectMenu.checkValidity(), "A selected placeholder option should invalidate the selectmenu.");
-
-  let emptyOption = document.createElement('option');
-  selectMenu.appendChild(emptyOption);
-  assert_false(selectMenu.checkValidity(), "A selected placeholder option should invalidate the selectmenu even if there are multiple options.");
-  emptyOption.selected = true;
-  assert_true(selectMenu.checkValidity(), "An empty non-placeholder option should be a valid choice.");
-
-  let filledOption = document.createElement('option');
-  filledOption.value = "test";
-  selectMenu.appendChild(filledOption);
-  filledOption.selected = true;
-  assert_equals(selectMenu.value, "test", "The non-empty value should be set.");
-  assert_true(selectMenu.checkValidity(), "A non-empty non-placeholder option should be a valid choice.");
-
-  selectMenu.removeChild(option);
-  selectMenu.appendChild(emptyOption);
-  emptyOption.selected = true;
-  assert_equals(selectMenu.value, "", "The empty value should be set.");
-  assert_true(selectMenu.checkValidity(), "Only the first option can be seen as a placeholder.");
-
-  selectMenu.removeChild(filledOption);
-  assert_false(selectMenu.checkValidity(), "A selected placeholder option should invalidate the selectmenu.");
-
-  emptyOption.value = "test2";
-  assert_equals(selectMenu.value, "test2");
-  assert_true(selectMenu.checkValidity(), "A non-empty option value should be a valid choice.");
-
-  emptyOption.removeAttribute("value");
-  assert_equals(selectMenu.value, "");
-  assert_false(selectMenu.checkValidity());
-  emptyOption.innerText = "test";
-  assert_equals(selectMenu.value, "test");
-  assert_true(selectMenu.checkValidity(), "A non-empty option should be a valid choice.");
-
-  const selectMenu1 = document.getElementById('selectmenu1');
-  assert_equals(selectMenu1.value, "one");
-  assert_true(selectMenu1.checkValidity(), "A selectmenu with non-empty placeholder option should be valid.");
-}, "Validation for placeholder option");
-
-test(() => {
-  const selectMenu2 = document.getElementById('selectmenu2');
-  assert_equals(selectMenu2.value, "");
-  assert_false(selectMenu2.checkValidity());
-  let form = document.querySelector('form');
-  let invalidControl = form.querySelector('selectmenu:invalid');
-  assert_equals(selectMenu2, invalidControl);
-  let didDispatchInvalid = false;
-  invalidControl.addEventListener('invalid', e => { didDispatchInvalid = true; });
-  let didDispatchSubmit = false;
-  form.addEventListener('submit', event => { event.preventDefault(); didDispatchSubmit = true; });
-
-  form.requestSubmit();
-  assert_true(didDispatchInvalid);
-  assert_false(didDispatchSubmit);
-}, "Check form not submitted for invalid selectmenu");
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html
deleted file mode 100644
index 8998a07e03c..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-value-selectedOption.tentative.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE html>
-<title>HTMLSelectMenuElement Test: value and selectedOption</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<selectmenu id="selectMenu0"></selectmenu>
-
-<selectmenu id="selectMenu1">
-  <option>one</option>
-  <option>two</option>
-  <div>I'm a div with no part attr</div>
-  <option id="selectMenu1-option3">three</option>
-  <option>four</option>
-</selectmenu>
-
-<selectmenu id="selectMenu2">
-  <div behavior="option">one</div>
-  <div behavior="option">two</div>
-  <div>I'm a div with no part attr</div>
-  <div behavior="option">three</div>
-  <div behavior="option">four</div>
-</selectmenu>
-
-<selectmenu id="selectMenu3">
-  <div>I'm a div with no part attr</div>
-  <option id="selectMenu3-child1">one</option>
-  <option id="selectMenu3-child2">two</option>
-  <option id="selectMenu3-child3">three</option>
-</selectmenu>
-
-<selectmenu id="selectMenu4">
-  <div slot="button" behavior="button">
-    <div behavior="selected-value" id="selectMenu4-custom-selected-value">Default custom selected-value text</div>
-  </div>
-  <option id="selectMenu4-option1">one</option>
-  <option id="selectMenu4-option2">two</option>
-</selectmenu>
-
-<selectmenu id="selectMenu5">
-  <div slot="button" behavior="button">
-    <div behavior="selected-value" id="selectMenu5-custom-selected-value">Default custom selected-value text</div>
-  </div>
-  <div popover slot="listbox" behavior="listbox">
-    <option id="selectMenu5-option1">one</option>
-    <option id="selectMenu5-option2">two</option>
-  </div>
-</selectmenu>
-
-<selectmenu id="selectMenu6">
-  <option id="selectMenu6-option1">one</option>
-  <option id="selectMenu6-option2" selected>two</option>
-  <option id="selectMenu6-option3">three</option>
-</selectmenu>
-
-<selectmenu id="selectMenu7">
-  <option id="selectMenu7-option1">one</option>
-  <option id="selectMenu7-option2" selected value="test">two</option>
-  <option>three</option>
-</selectmenu>
-
-<script>
-
-test(() => {
-  const selectMenu0 = document.getElementById("selectMenu0");
-  assert_equals(selectMenu0.value, "");
-  assert_equals(selectMenu0.selectedOption, null);
-  selectMenu0.value = "something";
-  assert_equals(selectMenu0.value, "", "If there is no matching option, selectmenu should be cleared");
-  assert_equals(selectMenu0.selectedOption, null);
-}, "Test that HTMLSelectMenu with no options has empty string for value and null for selectedOption");
-
-test(() => {
-  const selectMenu1 = document.getElementById("selectMenu1");
-  assert_equals(selectMenu1.value, "one", "value should start with the text of the first option part");
-
-  selectMenu1.value = "three";
-  assert_equals(selectMenu1.value, "three", "value can be set to the text of an option part");
-  assert_equals(selectMenu1.selectedOption, document.getElementById("selectMenu1-option3"));
-
-  selectMenu1.value = "I'm a div with no part attr";
-  assert_equals(selectMenu1.value, "", "If there is no matching option selectmenu should be cleared");
-  assert_equals(selectMenu1.selectedOption, null);
-}, "Test value and selectedOption with HTMLOptionElement element option parts");
-
-test(() => {
-  const selectMenu1 = document.getElementById("selectMenu1");
-  selectMenu1.value = "one";
-  assert_equals(selectMenu1.value, "one");
-
-  selectMenu1.value = null;
-  assert_equals(selectMenu1.value, "");
-  assert_equals(selectMenu1.selectedOption, null);
-}, "Test value and selectedOption when value is null");
-
-test(() => {
-  const selectMenu1 = document.getElementById("selectMenu1");
-  selectMenu1.value = "one";
-  assert_equals(selectMenu1.value, "one");
-
-  selectMenu1.value = undefined;
-  assert_equals(selectMenu1.value, "");
-  assert_equals(selectMenu1.selectedOption, null);
-}, "Test value and selectedOption when value is undefined");
-
-test(() => {
-  const selectMenu2 = document.getElementById("selectMenu2");
-  assert_equals(selectMenu2.value, "", "Non-HTMLOptionElements shouldn't be treated as option parts");
-  assert_equals(selectMenu2.selectedOption, null);
-
-  selectMenu2.value = "three";
-  assert_equals(selectMenu2.value, "", "value can't be set when there are no option parts'");
-  assert_equals(selectMenu2.selectedOption, null);
-}, "Test value with non-HTMLOptionElement elements labeled as parts");
-
-test(() => {
-  const selectMenu3 = document.getElementById("selectMenu3");
-  assert_equals(selectMenu3.value, "one", "value should start with the text of the first option part");
-  assert_equals(selectMenu3.selectedOption, document.getElementById("selectMenu3-child1"));
-
-  document.getElementById("selectMenu3-child3").remove();
-  assert_equals(selectMenu3.value, "one", "Removing a non-selected option should not change the value");
-  assert_equals(selectMenu3.selectedOption, document.getElementById("selectMenu3-child1"));
-
-  document.getElementById("selectMenu3-child1").remove();
-  assert_equals(selectMenu3.value, "two", "When the selected option is removed, the new first option should become selected");
-  assert_equals(selectMenu3.selectedOption, document.getElementById("selectMenu3-child2"));
-
-  document.getElementById("selectMenu3-child2").remove();
-  assert_equals(selectMenu3.value, "", "When all options are removed, value should be the empty string");
-  assert_equals(selectMenu3.selectedOption, null);
-}, "Test that value and selectedOption are updated when options are removed");
-
-test(() => {
-  const selectMenu4 = document.getElementById("selectMenu4");
-  let customSelectedValuePart = document.getElementById("selectMenu4-custom-selected-value");
-  assert_equals(selectMenu4.value, "one", "value should start with the text of the first option part");
-  assert_equals(selectMenu4.selectedOption, document.getElementById("selectMenu4-option1"));
-  assert_equals(customSelectedValuePart.innerText, "one", "Custom selected value part should be set to initial value of selectmenu");
-
-  selectMenu4.value = "two";
-  assert_equals(customSelectedValuePart.innerText, "two", "Custom selected value part should be updated when value of selectmenu changes");
-  assert_equals(selectMenu4.selectedOption, document.getElementById("selectMenu4-option2"));
-}, "Test that slotted-in selected-value part is updated to value of selectmenu");
-
-test(() => {
-  const selectMenu5 = document.getElementById("selectMenu5");
-  let customSelectedValuePart = document.getElementById("selectMenu5-custom-selected-value");
-  assert_equals(selectMenu5.value, "one", "value should start with the text of the first option part");
-  assert_equals(selectMenu5.selectedOption, document.getElementById("selectMenu5-option1"));
-  assert_equals(customSelectedValuePart.innerText, "one", "Custom selected value part should be set to initial value of selectmenu");
-
-  selectMenu5.value = "two";
-  assert_equals(customSelectedValuePart.innerText, "two", "Custom selected value part should be updated when value of selectmenu changes");
-  assert_equals(selectMenu5.selectedOption, document.getElementById("selectMenu5-option2"));
-}, "Test that option parts in a slotted-in listbox are reflected in the value property");
-
-test(() => {
-  let selectMenu = document.createElement('selectmenu');
-  assert_equals(selectMenu.value, "");
-  let option = document.createElement('option');
-  option.innerText = "one";
-  selectMenu.appendChild(option);
-  assert_equals(selectMenu.value, "one");
-  assert_equals(selectMenu.selectedOption, option);
-
-  let newOption = document.createElement('option');
-  newOption.innerText = 'two';
-  selectMenu.appendChild(newOption);
-  selectMenu.value = "two";
-  assert_equals(selectMenu.value, "two");
-  assert_equals(selectMenu.selectedOption, newOption);
-
-  option.click();
-  assert_equals(selectMenu.value, "one");
-  assert_equals(selectMenu.selectedOption, option);
-}, "Test that value and selectedOption are correctly updated");
-
-test(() => {
-  const selectMenu = document.getElementById("selectMenu6");
-  let selectMenuOption1 = document.getElementById("selectMenu6-option1");
-
-  assert_equals(selectMenu.value, "two");
-  assert_equals(selectMenu.selectedOption, document.getElementById("selectMenu6-option2"));
-  assert_false(selectMenuOption1.selected);
-  selectMenuOption1.selected = true;
-  assert_equals(selectMenu.value, "one");
-  assert_equals(selectMenu.selectedOption, selectMenuOption1);
-
-  let newOption = document.createElement("option");
-  newOption.innerText = "four";
-  newOption.selected = true;
-  selectMenu.appendChild(newOption);
-  assert_equals(selectMenu.value, "four");
-  assert_equals(selectMenu.selectedOption, newOption);
-  assert_false(selectMenuOption1.selected);
-
-  selectMenu.value = "three";
-  assert_equals(selectMenu.selectedOption, document.getElementById("selectMenu6-option3"));
-  assert_false(newOption.selected);
-}, "Test that HTMLOption.selected updates selectmenu.value and selectmenu.selectedOption");
-
-test(() => {
-  const selectMenu = document.getElementById("selectMenu7");
-  let selectMenuOption1 = document.getElementById("selectMenu7-option1");
-
-  assert_equals(selectMenu.value, "test");
-  assert_equals(selectMenu.selectedOption, document.getElementById("selectMenu7-option2"));
-  assert_false(selectMenuOption1.selected);
-  selectMenuOption1.selected = true;
-  assert_equals(selectMenu.value, "one");
-  assert_equals(selectMenu.selectedOption, selectMenuOption1);
-
-  selectMenuOption1.value = "new test";
-  assert_equals(selectMenu.value, "new test");
-  assert_equals(selectMenu.selectedOption, selectMenuOption1);
-  selectMenuOption1.removeAttribute("value");
-  assert_equals(selectMenu.value, "one");
-  assert_equals(selectMenu.selectedOption, selectMenuOption1);
-  selectMenuOption1.value = "";
-  assert_equals(selectMenu.value, "");
-  assert_equals(selectMenu.selectedOption, selectMenuOption1);
-}, "Test that HTMLOption.value updates selectmenu.value");
-
-</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html b/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html
deleted file mode 100644
index d2486ad9cc2..00000000000
--- a/tests/wpt/tests/html/semantics/forms/the-selectmenu-element/selectmenu-writingmode-tb-ref.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<selectmenu style="writing-mode: horizontal-tb">
-  <option>hello</option>
-</selectmenu>
diff --git a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html
index 431d38449c3..e587569a3c6 100644
--- a/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html
+++ b/tests/wpt/tests/navigation-api/navigate-event/navigate-navigation-back-same-document.html
@@ -23,6 +23,7 @@ async_test(t => {
         assert_equals(e.destination.index, 0);
         assert_equals(e.formData, null);
         assert_equals(e.info, "hi");
+        assert_not_equals(e.hasUAVisualTransition, undefined);
       });
       assert_true(navigation.canGoBack);
       navigation.back({ info: "hi" });
diff --git a/tests/wpt/tests/requestidlecallback/callback-idle-periods.html b/tests/wpt/tests/requestidlecallback/callback-idle-periods.html
index 3c2de61bfea..f515755e353 100644
--- a/tests/wpt/tests/requestidlecallback/callback-idle-periods.html
+++ b/tests/wpt/tests/requestidlecallback/callback-idle-periods.html
@@ -16,7 +16,7 @@ async_test(function() {
     var remaining = deadline.timeRemaining();
     var new_deadline = now + remaining;
     if (previous_deadline != undefined) {
-      assert_true(new_deadline > previous_deadline, "A requestIdleCallback scheduled during an idle period should be called back with a deadline greater than that in the current idle period.");
+      assert_true(new_deadline >= previous_deadline, "A requestIdleCallback scheduled during an idle period should be called back with a deadline greater than or equal to that in the current idle period.");
     }
 
     // Schedule a new requestIdleCallback.
diff --git a/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html
index 05e6e0b1e06..f635768c69f 100644
--- a/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html
+++ b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlDictionary/test_partial_interface_of.html
@@ -3,7 +3,6 @@
 
 <head>
   <meta charset="utf-8">
-  <meta name="variant" content="">
   <title>idlharness: Partial dictionary</title>
   <script src="/resources/test/variants.js"></script>
   <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html
index 671196cc5df..7dd9e676af4 100644
--- a/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html
+++ b/tests/wpt/tests/resources/test/tests/functional/idlharness/IdlInterface/test_partial_interface_of.html
@@ -3,7 +3,6 @@
 
 <head>
   <meta charset="utf-8">
-  <meta name="variant" content="">
   <title>idlharness: Partial interface</title>
   <script src="/resources/test/variants.js"></script>
   <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/tests/scroll-animations/css/animation-range-visual-test.html b/tests/wpt/tests/scroll-animations/css/animation-range-visual-test.html
index 8d68603701b..1ff2b12d1f9 100644
--- a/tests/wpt/tests/scroll-animations/css/animation-range-visual-test.html
+++ b/tests/wpt/tests/scroll-animations/css/animation-range-visual-test.html
@@ -5,6 +5,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#named-timeline-range">
 <link rel="match" href="animation-range-visual-test-ref.html">
+<meta name=fuzzy content="maxDifference=0-64;totalPixels=0-15">
 <link rel="stylesheet" href="support/animation-range.css">
 <script src="/common/reftest-wait.js"></script>
 <script src="/web-animations/testcommon.js"></script>
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 cf5e74898af..a26500989ed 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
@@ -36,7 +36,7 @@ promise_test(async t => {
   await animation.ready;
 
   // Animation current time is at 20% because scroller was scrolled to 20%
-  assert_equals(animation.currentTime.value, 20);
+  assert_percents_equal(animation.currentTime, 20);
   assert_equals(scroller.scrollTop, 180);
   assert_equals(maxScroll, 900);
 
@@ -52,9 +52,10 @@ promise_test(async t => {
 
   const expected_progress = (scroller.scrollTop / maxScroll) * 100;
   assert_true(expected_progress > initial_progress)
-  assert_equals(animation.currentTime.value, expected_progress); // 45%
-  assert_equals(animation.timeline.currentTime.value, expected_progress); // 45%
-  assert_equals(animation.effect.getComputedTiming().localTime.value, expected_progress); // 45%
+  // @ 45%
+  assert_percents_equal(animation.currentTime, expected_progress);
+  assert_percents_equal(animation.timeline.currentTime, expected_progress);
+  assert_percents_equal(animation.effect.getComputedTiming().localTime, expected_progress);
 }, 'Animation current time and effect local time are updated after scroller ' +
    'content size changes.');
 
@@ -72,7 +73,7 @@ promise_test(async t => {
 
   // Animation current time is at 20% because scroller was scrolled to 20%
   // assert_equals(animation.currentTime.value, 20);
-  assert_equals(animation.currentTime.value, 20);
+  assert_percents_equal(animation.currentTime, 20);
   assert_equals(scroller.scrollTop, scrollOffset);
   assert_equals(maxScroll, 900);
 
@@ -86,9 +87,11 @@ promise_test(async t => {
 
   const expected_progress = (scroller.scrollTop / maxScroll) * 100;
   assert_true(expected_progress > initial_progress);
-  assert_equals(animation.currentTime.value, expected_progress); // 45%
-  assert_equals(animation.timeline.currentTime.value, expected_progress); // 45%
-  assert_equals(animation.effect.getComputedTiming().localTime.value, expected_progress); // 45%
+  // @ 45%
+  assert_percents_equal(animation.currentTime, expected_progress);
+  assert_percents_equal(animation.timeline.currentTime, expected_progress);
+  assert_percents_equal(animation.effect.getComputedTiming().localTime,
+                        expected_progress);
 }, 'Animation current time and effect local time are updated after scroller ' +
    'size changes.');
 
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/contain-alignment.html b/tests/wpt/tests/scroll-animations/view-timelines/contain-alignment.html
new file mode 100644
index 00000000000..8b61a9ab81c
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/view-timelines/contain-alignment.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/">
+<style>
+
+@keyframes bg {
+  from { background-color:  rgb(254, 0, 0); }
+  to { background-color: rgb(0 254, 0); }
+}
+.item {
+  flex-grow: 1;
+  width: 2em;
+  height: 2em;
+  background: #888;
+  animation: bg linear;
+  animation-timeline: view();
+  animation-range: contain;
+}
+
+.inline .item {
+  animation-timeline: view(inline);
+}
+
+.scroller {
+  width: 10em;
+  height: 10em;
+  outline: 1px solid;
+  margin: 1em;
+  overflow: auto;
+  display: inline-flex;
+  vertical-align: top;
+  flex-direction: column;
+  gap: 1em;
+  resize: vertical;
+}
+
+.inline {
+  resize: horizontal;
+  flex-direction: row;
+}
+
+.block .spacer {
+  height: 20em;
+  width: 1em;
+}
+
+.inline .spacer {
+  width: 20em;
+  height: 1em;
+}
+</style>
+<body>
+<div class="scroller block">
+  <div class="item" id="a"></div>
+  <div class="item" id="b"></div>
+  <div class="item" id="c"></div>
+</div>
+
+<div class="scroller inline">
+  <div class="item" id="d"></div>
+  <div class="item" id="e"></div>
+  <div class="item" id="f"></div>
+</div>
+
+<br>
+
+<div class="scroller block">
+  <div class="item" id="g"></div>
+  <div class="item" id="h"></div>
+</div>
+
+<div class="scroller inline">
+  <div class="item" id="i"></div>
+  <div class="item" id="j"></div>
+</div>
+</body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script type="text/javascript">
+  promise_test(async t => {
+    let anims = document.getAnimations();
+    await Promise.all(anims.map(anim => anim.ready));
+    await waitForNextFrame();
+
+    const expected_results = [
+      { id: "a", progress: 1.0, bg: 'rgb(0, 254, 0)' },
+      { id: "b", progress: 0.5, bg: 'rgb(127, 127, 0)' },
+      { id: "c", progress: 0.0, bg: 'rgb(254, 0, 0)' },
+      { id: "d", progress: 1.0, bg: 'rgb(0, 254, 0)' },
+      { id: "e", progress: 0.5, bg: 'rgb(127, 127, 0)' },
+      { id: "f", progress: 0.0, bg: 'rgb(254, 0, 0)' },
+      { id: "g", progress: 1.0, bg: 'rgb(0, 254, 0)' },
+      { id: "h", progress: 0.0, bg: 'rgb(254, 0, 0)' },
+      { id: "i", progress: 1.0, bg: 'rgb(0, 254, 0)' },
+      { id: "j", progress: 0.0, bg: 'rgb(254, 0, 0)' }
+    ];
+
+    expected_results.forEach(result => {
+      const element = document.getElementById(result.id);
+      const anim = element.getAnimations()[0];
+      assert_approx_equals(anim.effect.getComputedTiming().progress,
+        result.progress, 1e-3,
+        `${result.id}: Unexpected progress`);
+      assert_equals(getComputedStyle(element).backgroundColor,
+                    result.bg, `${result.id}: Mismatched background color`);
+    });
+
+  }, 'Stability of animated elements aligned to the bounds of a contain region');
+</script>
+</html>
diff --git a/tests/wpt/tests/scroll-animations/view-timelines/subject-br-crash.html b/tests/wpt/tests/scroll-animations/view-timelines/subject-br-crash.html
new file mode 100644
index 00000000000..36627dbea63
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/view-timelines/subject-br-crash.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/scroll-animations-1/#viewtimeline-interface">
+<html>
+<!-- crbug.com/1470522 --->
+<script>
+    function main() {
+        var b = document.createElement("br");
+        document.body.append(b);
+        new ViewTimeline({ subject: b });
+    }
+</script>
+<body onload=main()>
+</body>
+</html>
diff --git a/tests/wpt/tests/tools/lint/lint.py b/tests/wpt/tests/tools/lint/lint.py
index 9fc78d9b68e..00d76144ea8 100644
--- a/tests/wpt/tests/tools/lint/lint.py
+++ b/tests/wpt/tests/tools/lint/lint.py
@@ -453,11 +453,11 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
                 errors.append(rules.VariantMissing.error(path))
             else:
                 variant = element.attrib["content"]
-                if variant != "":
-                    if (variant[0] not in ("?", "#") or
-                        len(variant) == 1 or
-                        (variant[0] == "?" and variant[1] == "#")):
-                        errors.append(rules.MalformedVariant.error(path, (path,)))
+                if (variant == "" or
+                    variant[0] not in ("?", "#") or
+                    len(variant) == 1 or
+                    (variant[0] == "?" and variant[1] == "#")):
+                    errors.append(rules.MalformedVariant.error(path, (path,)))
 
         required_elements.extend(key for key, value in {"testharness": True,
                                                         "testharnessreport": len(testharnessreport_nodes) > 0,
diff --git a/tests/wpt/tests/tools/lint/rules.py b/tests/wpt/tests/tools/lint/rules.py
index 88b7b6d80c3..580ef8009cd 100644
--- a/tests/wpt/tests/tools/lint/rules.py
+++ b/tests/wpt/tests/tools/lint/rules.py
@@ -198,8 +198,8 @@ class VariantMissing(Rule):
 class MalformedVariant(Rule):
     name = "MALFORMED-VARIANT"
     description = collapse("""
-        %s `<meta name=variant>` 'content' attribute must be the empty string
-        or start with '?' or '#'
+        %s `<meta name=variant>` 'content' attribute must be a non empty string
+        and start with '?' or '#'
     """)
 
 
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 9a49d6e7a24..62a380e1a40 100644
--- a/tests/wpt/tests/tools/lint/tests/test_file_lints.py
+++ b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
@@ -610,8 +610,7 @@ def test_variant_missing():
 # A corresponding "positive" test cannot be written because the manifest
 # SourceFile implementation raises a runtime exception for the condition this
 # linting rule describes
-@pytest.mark.parametrize("content", ["",
-                                     "?foo"
+@pytest.mark.parametrize("content", ["?foo"
                                      "#bar"])
 def test_variant_malformed_negative(content):
     code = """\
diff --git a/tests/wpt/tests/tools/manifest/tests/test_sourcefile.py b/tests/wpt/tests/tools/manifest/tests/test_sourcefile.py
index 4b98e718d03..298e480c142 100644
--- a/tests/wpt/tests/tools/manifest/tests/test_sourcefile.py
+++ b/tests/wpt/tests/tools/manifest/tests/test_sourcefile.py
@@ -235,7 +235,7 @@ test()"""
 
 
 def test_worker_with_variants():
-    contents = b"""// META: variant=
+    contents = b"""// META: variant=?default
 // META: variant=?wss
 test()"""
 
@@ -255,7 +255,7 @@ test()"""
 
     expected_urls = [
         "/html/test.worker.html" + suffix
-        for suffix in ["", "?wss"]
+        for suffix in ["?default", "?wss"]
     ]
     assert len(items) == len(expected_urls)
 
@@ -265,7 +265,7 @@ test()"""
 
 
 def test_window_with_variants():
-    contents = b"""// META: variant=
+    contents = b"""// META: variant=?default
 // META: variant=?wss
 test()"""
 
@@ -285,7 +285,7 @@ test()"""
 
     expected_urls = [
         "/html/test.window.html" + suffix
-        for suffix in ["", "?wss"]
+        for suffix in ["?default", "?wss"]
     ]
     assert len(items) == len(expected_urls)
 
@@ -429,7 +429,7 @@ test()"""
 
 def test_multi_global_with_variants():
     contents = b"""// META: global=window,worker
-// META: variant=
+// META: variant=?default
 // META: variant=?wss
 test()"""
 
@@ -456,7 +456,7 @@ test()"""
     expected_urls = sorted(
         urls[ty] + suffix
         for ty in ["dedicatedworker", "serviceworker", "sharedworker", "window"]
-        for suffix in ["", "?wss"]
+        for suffix in ["?default", "?wss"]
     )
     assert len(items) == len(expected_urls)
 
@@ -859,7 +859,7 @@ def test_spec_links_complex(input, expected):
 
 def test_url_base():
     contents = b"""// META: global=window,worker
-// META: variant=
+// META: variant=?default
 // META: variant=?wss
 test()"""
 
@@ -868,13 +868,13 @@ test()"""
 
     assert item_type == "testharness"
 
-    assert [item.url for item in items] == ['/_fake_base/html/test.any.html',
+    assert [item.url for item in items] == ['/_fake_base/html/test.any.html?default',
                                             '/_fake_base/html/test.any.html?wss',
-                                            '/_fake_base/html/test.any.serviceworker.html',
+                                            '/_fake_base/html/test.any.serviceworker.html?default',
                                             '/_fake_base/html/test.any.serviceworker.html?wss',
-                                            '/_fake_base/html/test.any.sharedworker.html',
+                                            '/_fake_base/html/test.any.sharedworker.html?default',
                                             '/_fake_base/html/test.any.sharedworker.html?wss',
-                                            '/_fake_base/html/test.any.worker.html',
+                                            '/_fake_base/html/test.any.worker.html?default',
                                             '/_fake_base/html/test.any.worker.html?wss']
 
     assert items[0].url_base == "/_fake_base/"
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
index 3d97ccbd976..047bfa02451 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -62,7 +62,7 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
                 }
             },
             "excludeSwitches": ["enable-automation"],
-            "w3c": True
+            "w3c": True,
         }
     }
 
@@ -93,6 +93,8 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
     # on Linux as it hasn't shipped there yet, but in WPT we enable virtual
     # authenticator devices anyway for testing and so SPC works.
     chrome_options["args"].append("--enable-features=SecurePaymentConfirmationBrowser")
+    # For WebTransport tests.
+    chrome_options["args"].append("--webtransport-developer-mode")
 
     # Classify `http-private`, `http-public` and https variants in the
     # appropriate IP address spaces.
@@ -122,21 +124,16 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data,
     if kwargs["enable_experimental"]:
         chrome_options["args"].extend(["--enable-experimental-web-platform-features"])
 
-    # Copy over any other flags that were passed in via --binary_args
-    if kwargs["binary_args"] is not None:
-        chrome_options["args"].extend(kwargs["binary_args"])
-
     # Pass the --headless flag to Chrome if WPT's own --headless flag was set
     # or if we're running print reftests because of crbug.com/753118
     if ((kwargs["headless"] or test_type == "print-reftest") and
         "--headless" not in chrome_options["args"]):
         chrome_options["args"].append("--headless")
 
-    # For WebTransport tests.
-    webtranport_h3_port = test_environment.config.ports.get('webtransport-h3')
-    if webtranport_h3_port is not None:
-        chrome_options["args"].append(
-            f"--origin-to-force-quic-on=web-platform.test:{webtranport_h3_port[0]}")
+    # Copy over any other flags that were passed in via `--binary-arg`
+    for arg in kwargs.get("binary_args", []):
+        if arg not in chrome_options["args"]:
+            chrome_options["args"].append(arg)
 
     if test_type == "wdspec":
         executor_kwargs["binary_args"] = chrome_options["args"]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py
index 4bbb42cc267..45fb48a6272 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/content_shell.py
@@ -43,21 +43,21 @@ def check_args(**kwargs):
 
 
 def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
-    args = list(kwargs["binary_args"])
-
+    args = []
     args.append("--ignore-certificate-errors-spki-list=%s" %
         ','.join(chrome_spki_certs.IGNORE_CERTIFICATE_ERRORS_SPKI_LIST))
-
-    webtranport_h3_port = config.ports.get('webtransport-h3')
-    if webtranport_h3_port is not None:
-        args.append(
-            f"--origin-to-force-quic-on=web-platform.test:{webtranport_h3_port[0]}")
+    # For WebTransport tests.
+    args.append("--webtransport-developer-mode")
 
     if not kwargs["headless"]:
         args.append("--disable-headless-mode")
 
-    # These flags are specific to content_shell - they activate web test protocol mode.
+    # `--run-web-tests -` are specific to content_shell - they activate web
+    # test protocol mode.
     args.append("--run-web-tests")
+    for arg in kwargs.get("binary_args", []):
+        if arg not in args:
+            args.append(arg)
     args.append("-")
 
     return {"binary": kwargs["binary"],
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
index 1ff25781ba4..8ca0a7a9a60 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorcontentshell.py
@@ -279,6 +279,12 @@ class ContentShellPrintRefTestExecutor(ContentShellRefTestExecutor):
 
 
 class ContentShellTestharnessExecutor(TestharnessExecutor, _SanitizerMixin):  # type: ignore
+    # Chromium's `testdriver-vendor.js` partially implements testdriver support
+    # with internal APIs [1].
+    #
+    # [1]: https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/writing_web_tests.md#Relying-on-Blink_Specific-Testing-APIs
+    supports_testdriver = True
+
     def __init__(self, logger, browser, server_config, timeout_multiplier=1, debug_info=None,
             **kwargs):
         super().__init__(logger, browser, server_config, timeout_multiplier, debug_info, **kwargs)
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
index 0cb71bcbfad..1ea44041d93 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -223,10 +223,14 @@ def run_test_iteration(test_status, test_loader, test_source_kwargs, test_source
         if test_type == "testharness":
             tests_to_run[test_type] = []
             for test in test_loader.tests[test_type]:
-                if ((test.testdriver and not executor_cls.supports_testdriver) or
-                        (test.jsshell and not executor_cls.supports_jsshell)):
+                skip_reason = None
+                if test.testdriver and not executor_cls.supports_testdriver:
+                    skip_reason = "Executor does not support testdriver.js"
+                elif test.jsshell and not executor_cls.supports_jsshell:
+                    skip_reason = "Executor does not support jsshell"
+                if skip_reason:
                     logger.test_start(test.id)
-                    logger.test_end(test.id, status="SKIP")
+                    logger.test_end(test.id, status="SKIP", message=skip_reason)
                     test_status.skipped += 1
                 else:
                     tests_to_run[test_type].append(test)
diff --git a/tests/wpt/tests/wai-aria/META.yml b/tests/wpt/tests/wai-aria/META.yml
index 502b9c30251..17068230e58 100644
--- a/tests/wpt/tests/wai-aria/META.yml
+++ b/tests/wpt/tests/wai-aria/META.yml
@@ -3,6 +3,3 @@ suggested_reviewers:
   - cookiecrook
   - spectranaut
   - jnurthen
-  - halindrome
-  - joanmarie
-  - michael-n-cooper
diff --git a/tests/wpt/tests/wai-aria/role/fallback-roles.html b/tests/wpt/tests/wai-aria/role/fallback-roles.html
index 6f42fa693e5..98011570b4f 100644
--- a/tests/wpt/tests/wai-aria/role/fallback-roles.html
+++ b/tests/wpt/tests/wai-aria/role/fallback-roles.html
@@ -13,19 +13,41 @@
 
   <p>Tests <a href="https://w3c.github.io/aria/#host_general_role">8.1 Role Attribute</a> role token list selection and <a href="https://w3c.github.io/aria/#document-handling_author-errors_roles">9.1 Roles - handling author errors</a>.</p>
 
+  <!-- known el and two known ARIA 1.0 roles -->
   <nav role="region group" data-testname="fallback role w/ region with no label" data-expectedrole="group" class="ex">x</nav>
   <nav role="region group" data-testname="fallback role w/ region with label" aria-label="x" data-expectedrole="region" class="ex">x</nav>
 
-<!-- todo: additional fallback roles:
+  <!-- known el and known ARIA 1.1 with 1.0 role backup -->
+  <div role="switch checkbox" aria-checked="true" data-testname="aria 1.1 switch role w/ fallback to aria 1.0 checkbox role" aria-label="x" data-expectedrole="switch" class="ex">x</div>
 
-- valid/valid "switch checkbox"
-- invalid/valid "foo group"
-- unicode char tests with fallback
-- whitespace tests with fallback
-- unicode char tests with fallback
-- "invalid, punctuation, tests, link, button"
+  <!-- known el and invalid role token with valid backup -->
+  <div role="foo button" data-testname="div[role=button] ignoring invalid foo role token" aria-label="x" data-expectedrole="button" class="ex">x</div>
+
+  <!-- unknown el and invalid role token with valid backup -->
+  <unknown role="foo button" data-testname="unknown[role=button] ignoring invalid foo role token" aria-label="x" data-expectedrole="button" class="ex">x</unknown>
+
+  <!-- known el and invalid role(s) -->
+  <button role="foo" data-testname="button ignoring single invalid role token" aria-label="x" data-expectedrole="button" class="ex">x</unknown>
+  <button role="foo bar" data-testname="button ignoring multiple invalid role tokens" aria-label="x" data-expectedrole="button" class="ex">x</unknown>
+
+  <!-- known el with invalid punctuation -->
+  <div role="invalid, punctuation, tests, link, button" data-testname="div[role=button] ignoring invalid foo role token including punctuation-contaminated known link role" aria-label="x" data-expectedrole="button" class="ex">x</div>
+
+
+
+  <!-- extra line breaks here to account for rendering of unicode diacritic etc char glitch tests -->
+
+
+
+  <div role="l̷̨̢̡̖̻̗̤̺̟̱͚͔͇͍͇̫̫̜͔̗̟̘̫̟̰̼̘͗̌̃͐̔̈́̚͝į̵̡̲̯̠̮͈͖̥̮̲͓̦̗̗̱̞͍̗̪͙͇͚͂̍͐̔̍͌̐̇̏̎͘͝ǹ̶̨̧̢̜̲̫͇̮͉̬͎͎͕̝̱͔̙̱̦̰̦̠̰̣̝͂̓̋̊͜ķ̷̧̧̨̨̨̘̳͕̰͎̮̠̘̪͇͕̥̭̼̼̜̤̫̥̼̤̰̦͖̪̀͒̆͑̒̅͑̓̒͂̽̈́̽̉̀̕͘͜͝ ̷̡̮̦̘͓̫̜͕͖̰̙̘͓̼͎̳̹͇̮͐͂́͛̃́̊̈͌̄̓̌̂̈̇̀̌̈́́̀̈́̍̈́̇̄̊̔͒̾̾̇́͒̽͂̾̕̚͜͜͝͠ͅͅg̸̨̧̧̧̧̛̺̦̣͇͈͙͇͎͕̠̞̳̹̣͋͑̑̓͛̓̉̔̉͑̇́̈́̉̃́̑̍̂̒͐͛͗̑̏̓̾͌̈̅́̇̕̕̚̚͝͝ͅr̶̛̤̲̘̮̟̭̲̋̾̀́́̒̀̀͑̎̀̌̈̀̍̂̏̊̎͐͒͗͗̀͘͘͘͠͠ȍ̴̧̡̢̡̢̞̝̠̙̬̗͍͍͉̺͔͙̫̝̰̮̜̩̙̳͉̻̻̼͍̊͋͐̐͆̈̿̒̊̄͑̈́̔͋̔̃͐̓̓͛́͊̉͑̊̔͆͘͘͜͠ͅu̴̱̯̞̞̞̺̼̳̳͚̞̇̈͒͠p̶̛͉̮̙̯̮̱͉̖͚͉̩̱̺̩̦̺͈̫͍͔̲̣̗̟̜̂̐̌̏͌̈́͗̾͌̿̓͒̋̆͆̾͛̐̈́̓͋̀͘̚͝͝͝ ̶͔͚̩̬͈̍̈́͗͐̀̊̏͛̃̈́͋̅͝  button" data-testname="div[role=button] ignoring invalid unicode diacritics etc on link and group role tokens" aria-label="x" data-expectedrole="button" class="ex">x</div>
+
+
+  <!-- known el and known role with whitespace edge cases -->
+  <div role=" button" data-testname="div[role=button] ignoring tab char" aria-label="x" data-expectedrole="button" class="ex">x</div>
+  <div role="
+button" data-testname="div[role=button] ignoring line break" aria-label="x" data-expectedrole="button" class="ex">x</div>
+  <div role="⠀ button" data-testname="div[role=button] ignoring braille whitespace char" aria-label="x" data-expectedrole="button" class="ex">x</div>
 
--->
 
 <script>
 AriaUtils.verifyRolesBySelector(".ex");
diff --git a/tests/wpt/tests/wai-aria/role/grid-roles.html b/tests/wpt/tests/wai-aria/role/grid-roles.html
new file mode 100644
index 00000000000..d26af5d76fd
--- /dev/null
+++ b/tests/wpt/tests/wai-aria/role/grid-roles.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Grid Role Verification 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 <a href="https://w3c.github.io/aria/#grid">grid</a> and related roles.</p>
+
+  <div role="grid" data-testname="role is grid" data-expectedrole="grid" class="ex">
+    <div role="row" data-testname="role is row (in grid)" data-expectedrole="row" class="ex">
+      <span role="columnheader" data-testname="role is columnheader (in row, in grid)" data-expectedrole="columnheader" class="ex">x</span>
+      <span role="columnheader">x</span>
+    </div>
+    <div role="row">
+      <span role="rowheader" data-testname="role is rowheader (in row, in grid)" data-expectedrole="rowheader" class="ex">x</span>
+      <span role="gridcell" data-testname="role is gridcell (in row, in grid)" data-expectedrole="gridcell" class="ex">x</span>
+    </div>
+  </div>
+
+  <div role="grid">
+    <div role="rowgroup" data-testname="role is rowgroup (in grid)" data-expectedrole="rowgroup" class="ex">
+      <div role="row" data-testname="role is row (in rowgroup, in grid)" data-expectedrole="row" class="ex">
+        <span role="columnheader" data-testname="role is columnheader (in row, in rowgroup, in grid)" data-expectedrole="columnheader" class="ex">x</span>
+        <span role="columnheader">x</span>
+        <span role="columnheader">x</span>
+      </div>
+    </div>
+    <div role="rowgroup">
+      <div role="row">
+        <span role="rowheader" data-testname="role is rowheader (in row, in rowgroup, in grid)" data-expectedrole="rowheader" class="ex">x</span>
+        <span role="gridcell" data-testname="role is gridcell (in row, in rowgroup, in grid)" data-expectedrole="gridcell" class="ex">x</span>
+        <span role="gridcell">x</span>
+      </div>
+    </div>
+  </div>
+
+  <div role="gridcell" data-testname="orphaned gridcell outside the context of row" data-expectedrole="none" class="ex">x</div>
+  <div role="rowheader" data-testname="orphaned rowheader outside the context of row" data-expectedrole="none" class="ex">x</div>
+  <div role="columnheader" data-testname="orphaned columnheader outside the context of row" data-expectedrole="none" class="ex">x</div>
+
+<script>
+AriaUtils.verifyRolesBySelector(".ex");
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html
index ea93cab96a6..c011f336df4 100644
--- a/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html
+++ b/tests/wpt/tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html
@@ -391,11 +391,11 @@ function testResumeInStateChangeForResumeCallback() {
 
 var tests = [
   testOfflineAudioContext,
-  testMultiContextOutput,
-  testMultiContextInput,
   testSuspendResumeEventLoop,
   testResumeInStateChangeForResumeCallback,
   testAudioContext,
+  testMultiContextOutput,
+  testMultiContextInput,
 ];
 
 tests.forEach(function (f) {
diff --git a/tests/wpt/tests/webcodecs/video-decoder.https.any.js b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
index 3c4ca479ce4..c68315261fb 100644
--- a/tests/wpt/tests/webcodecs/video-decoder.https.any.js
+++ b/tests/wpt/tests/webcodecs/video-decoder.https.any.js
@@ -82,12 +82,21 @@ validButUnsupportedConfigs.forEach(entry => {
 });
 
 validButUnsupportedConfigs.forEach(entry => {
-  async_test(
-      t => {
-        let codec = new VideoDecoder(getDefaultCodecInit(t));
-        assert_throws_dom('NotSupportedError', () => {
-          codec.configure(entry.config);
+  promise_test(
+    async t => {
+        const callbacks = {
+          output: t.unreached_func('unexpected output'),
+        };
+        const error = new Promise(resolve => callbacks.error = e => {
+          resolve(e);
         });
+        let codec = new VideoDecoder(callbacks);
+        codec.configure(entry.config);
+        let e = await error;
+        assert_true(e instanceof DOMException);
+        assert_equals(e.name, 'NotSupportedError');
+        assert_equals(codec.state, 'closed', 'state');
+
         t.done();
       },
       'Test that VideoDecoder.configure() doesn\'t support config: ' +
@@ -109,3 +118,23 @@ promise_test(t => {
 
   return endAfterEventLoopTurn();
 }, 'Test VideoDecoder construction');
+
+const validConfigs = [
+  {
+    comment: 'valid codec with spaces',
+    config: {codec: '  vp09.00.10.08  '},
+  },
+];  // validConfigs
+
+validConfigs.forEach(entry => {
+  promise_test(
+    async t => {
+      try {
+        await VideoDecoder.isConfigSupported(entry.config);
+      } catch (e) {
+        assert_true(false, entry.comment + ' should not throw');
+      }
+    },
+    'Test that VideoDecoder.isConfigSupported() accepts config:' +
+        entry.comment);
+});
diff --git a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py
index 6a21f11e7ba..18f64fb5189 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/browsing_context/capture_screenshot/__init__.py
@@ -57,7 +57,7 @@ async def get_physical_element_dimensions(bidi_session, context, element):
     """
     element_dimensions = await get_element_dimensions(bidi_session, context, element)
     dpr = await get_device_pixel_ratio(bidi_session, context)
-    return (element_dimensions["width"] * dpr, element_dimensions["height"] * dpr)
+    return (floor(element_dimensions["width"] * dpr), floor(element_dimensions["height"] * dpr))
 
 
 async def get_physical_viewport_dimensions(bidi_session, context):
diff --git a/tests/wpt/tests/webrtc/RTCPeerConnection-removeTrack.https.html b/tests/wpt/tests/webrtc/RTCPeerConnection-removeTrack.https.html
index 83095c085a8..d0229a4c6c6 100644
--- a/tests/wpt/tests/webrtc/RTCPeerConnection-removeTrack.https.html
+++ b/tests/wpt/tests/webrtc/RTCPeerConnection-removeTrack.https.html
@@ -301,6 +301,8 @@
     const sender = pc.addTrack(track, stream);
 
     pc.getTransceivers()[0].stop();
+    // TODO: Spec says this only sets [[Stopping]], not [[Stopped]]. Spec
+    // might change: https://github.com/w3c/webrtc-pc/issues/2874
     pc.removeTrack(sender);
     assert_equals(sender.track, track);
   }, "Calling removeTrack on a stopped transceiver should be a no-op");
diff --git a/tests/wpt/tests/webrtc/RTCRtpSender-replaceTrack.https.html b/tests/wpt/tests/webrtc/RTCRtpSender-replaceTrack.https.html
index bec44c53e46..34f85737558 100644
--- a/tests/wpt/tests/webrtc/RTCRtpSender-replaceTrack.https.html
+++ b/tests/wpt/tests/webrtc/RTCRtpSender-replaceTrack.https.html
@@ -79,7 +79,6 @@
     const transceiver = pc.addTransceiver('audio');
     const { sender } = transceiver;
     transceiver.stop();
-
     return promise_rejects_dom(t, 'InvalidStateError',
       sender.replaceTrack(track));
   }, 'Calling replaceTrack on stopped sender should reject with InvalidStateError');
diff --git a/tests/wpt/tests/webrtc/RTCRtpSender-setParameters.html b/tests/wpt/tests/webrtc/RTCRtpSender-setParameters.html
index 94c572343de..7c8740dd1dd 100644
--- a/tests/wpt/tests/webrtc/RTCRtpSender-setParameters.html
+++ b/tests/wpt/tests/webrtc/RTCRtpSender-setParameters.html
@@ -23,7 +23,6 @@
 
     const param = sender.getParameters();
     transceiver.stop();
-
     return promise_rejects_dom(t, 'InvalidStateError',
       sender.setParameters(param));
   }, `setParameters() when transceiver is stopped should reject with InvalidStateError`);
diff --git a/tests/wpt/tests/webrtc/RTCRtpTransceiver-stopping.https.html b/tests/wpt/tests/webrtc/RTCRtpTransceiver-stopping.https.html
index 16be25fe138..e085be6d3cf 100644
--- a/tests/wpt/tests/webrtc/RTCRtpTransceiver-stopping.https.html
+++ b/tests/wpt/tests/webrtc/RTCRtpTransceiver-stopping.https.html
@@ -49,8 +49,7 @@
     t.add_cleanup(() => pc.close());
 
     const transceiver = pc.addTransceiver(kind);
-    const trackEnded = new Promise(
-        r => { transceiver.receiver.track.onended = () => { r(); } });
+    const trackEnded = new Promise(r => transceiver.receiver.track.onended = r);
     assert_equals(transceiver.receiver.track.readyState, 'live');
     transceiver.stop();
     // Stopping triggers ending the track, but this happens asynchronously.
@@ -79,6 +78,10 @@
     // Applying the remote offer immediately ends the track, we don't need to
     // create or apply an answer.
     await pc2.setRemoteDescription(pc1.localDescription);
+    // sRD just resolved, so we're in the success task for sRD. The transition
+    // from live -> ended is queued right now.
+    assert_equals(pc2Transceiver.receiver.track.readyState, 'live');
+    await new Promise(r => pc2Transceiver.receiver.track.onended = r);
     assert_equals(pc2Transceiver.receiver.track.readyState, 'ended');
   }, `[${kind}] Remotely stopping a transceiver ends the track`);
 
@@ -152,8 +155,12 @@
     const [pc2Transceiver] = pc2.getTransceivers();
 
     // Rollback such that the transceiver is removed.
-    await pc2.setLocalDescription({type:'rollback'});
+    await pc2.setRemoteDescription({type:'rollback'});
     assert_equals(pc2.getTransceivers().length, 0);
+    // sRD just resolved, so we're in the success task for sRD. The transition
+    // from live -> ended is queued right now.
+    assert_equals(pc2Transceiver.receiver.track.readyState, 'live');
+    await new Promise(r => pc2Transceiver.receiver.track.onended = r);
     assert_equals(pc2Transceiver.receiver.track.readyState, 'ended');
   }, `[${kind}] Rollback when removing transceiver does end the track`);
 
@@ -172,7 +179,7 @@
     const [pc2Transceiver] = pc2.getTransceivers();
 
     // Rollback such that the transceiver is removed.
-    await pc2.setLocalDescription({type:'rollback'});
+    await pc2.setRemoteDescription({type:'rollback'});
     assert_equals(pc2.getTransceivers().length, 0);
     // The removed transceiver is stopped.
     assert_equals(pc2Transceiver.currentDirection, 'stopped',