From 75d64844153019cbd33385994cede79a2242d286 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Sat, 12 Sep 2020 08:20:19 +0000
Subject: [PATCH 1/9] Update web-platform-tests to revision
 9ca57e052ba1b19fa3dd46c6aa656e8d529469a8

---
 .../FileAPI/file/File-constructor.html.ini    |    4 +
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 -
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 +
 .../CSS2/floats/hit-test-floats-005.html.ini  |    4 -
 .../border-width-small-values-001-a.html.ini  |    2 +
 .../border-width-small-values-001-b.html.ini  |    2 +
 .../flex-aspect-ratio-img-row-006.html.ini    |    2 +
 ...able-with-percent-intrinsic-width.html.ini |    7 +
 ...e-orientation-background-position.html.ini |    2 +
 .../tab-size-interpolation.html.ini           |  589 ++
 .../tab-size/tab-size-inline-001.html.ini     |    2 +
 .../tab-size/tab-size-inline-002.html.ini     |    2 +
 .../tab-size/tab-size-integer-004.html.ini    |    2 +
 .../white-space/eol-spaces-bidi-002.html.ini  |    2 +
 .../white-space/trailing-ogham-001.html.ini   |    2 +
 .../white-space/trailing-ogham-002.html.ini   |    2 +
 .../white-space/trailing-ogham-003.html.ini   |    2 +
 .../css/cssom-view/CaretPosition-001.html.ini |    4 -
 .../cssom-view/elementFromPoint-001.html.ini  |    4 -
 .../elementsFromPoint-iframes.html.ini        |    3 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 +
 .../matchMedia-display-none-iframe.html.ini   |    2 +
 .../css/cssom/CSSCounterStyleRule.html.ini    |    4 +
 .../css/cssom/CSSFontFaceRule.html.ini        |    4 +
 ...backdrop-filter-svg-foreignObject.html.ini |    2 +
 .../mediaqueries/prefers-contrast.html.ini    |   12 +
 .../CustomElementRegistry.html.ini            |   49 +
 .../dom/events/Event-dispatch-click.html.ini  |    6 +
 .../api/request/request-structure.html.ini    |    7 +
 .../fetch/content-type/response.window.js.ini |   27 +-
 .../fetch/content-type/script.window.js.ini   |    2 +-
 .../embed.https.sub.tentative.html.ini}       |    2 +-
 .../stale-image.html.ini                      |    4 +
 .../api/document-fullscreen-enabled.html.ini  |    4 +
 .../failure-check-sequence.https.html.ini     |   13 +
 .../traverse_the_history_3.html.ini}          |    2 +-
 ...ross-origin-objects-on-new-window.html.ini |    2 +
 ...creating_browsing_context_test_01.html.ini |    4 +
 .../canvas-createImageBitmap-e_srgb.html.ini  |  107 +-
 ...reatePutGetImageData-colorManaged.html.ini |   18 -
 .../images/bypass-cache-revalidation.html.ini |    4 +
 .../html/dom/idlharness.https.html.ini        |   78 +-
 .../html/dom/idlharness.worker.js.ini         |   30 +-
 .../supported-elements.html.ini               |    3 +-
 .../fieldset-overflow-cssomview.html.ini      |    4 +
 .../hash-name-reference.html.ini              |    3 -
 .../no-cuechange-before-play.html.ini         |    4 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    1 +
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...ge-compositing-large-scale-change.html.ini |    2 +
 .../reload.window.js.ini                      |    5 +
 .../protocol.https.html.ini                   |   54 +
 .../protocol.tentative.https.html.ini         |   55 +
 ...evented-with-reference.optional.any.js.ini |    5 +
 ...vented-with-unregister.optional.any.js.ini |    5 +
 ...o-call-cleanupCallback.optional.any.js.ini |    5 +
 ...ldings-multiple-values.optional.any.js.ini |   57 +
 .../weakrefs/reentrancy.optional.any.js.ini   |    5 +
 ...turn-undefined-with-gc.optional.any.js.ini |    5 +
 ...gister-cleaned-up-cell.optional.any.js.ini |    5 +
 .../contenteditable/collapse.html.ini         |   10 +
 .../contenteditable/modify.tentative.html.ini |    4 +
 .../url/a-element-xhtml.xhtml.ini             |   36 +
 .../url/a-element.html.ini                    |   36 +
 .../url/url-constructor.html.ini              |   36 +
 .../url/url-setters.html.ini                  |    1 +
 .../wasm/jsapi/memory/constructor.any.js.ini  |    9 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 ...workletnode-with-parameters.https.html.ini |    2 +
 .../delay-test.html.ini                       |   13 +
 .../tests/execute_script/execute.py.ini       |   28 +
 .../hand-input/idlharness.https.window.js.ini |  229 +
 .../workers/WorkerGlobalScope-close.html.ini  |    4 -
 .../workers/Worker_script_mimetype.htm.ini    |    4 +
 .../Worker/Worker-constructor.html.ini        |    2 -
 .../message-classic-DOMException.html.ini     |    8 +
 .../onerror/message-classic-Error.html.ini    |    8 +
 .../message-module-DOMException.html.ini      |    8 +
 .../onerror/message-module-Error.html.ini     |    8 +
 .../FileAPI/file/File-constructor.html.ini    |    4 +
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 tests/wpt/metadata/MANIFEST.json              | 8493 ++++++++++++-----
 .../CSS2/floats/hit-test-floats-002.html.ini  |    4 -
 .../CSS2/floats/hit-test-floats-004.html.ini  |    4 +
 .../CSS2/floats/hit-test-floats-005.html.ini  |    4 -
 .../border-width-small-values-001-a.html.ini  |    2 +
 .../border-width-small-values-001-b.html.ini  |    2 +
 .../canvas-dynamic-change-001.html.ini        |    4 +
 .../flex-aspect-ratio-img-row-006.html.ini    |    2 +
 ...able-with-percent-intrinsic-width.html.ini |    7 +
 ...e-orientation-background-position.html.ini |    2 +
 .../tab-size-interpolation.html.ini           |  589 ++
 .../tab-size/tab-size-inline-001.html.ini     |    2 +
 .../tab-size/tab-size-inline-002.html.ini     |    2 +
 .../tab-size/tab-size-integer-004.html.ini    |    2 +
 .../white-space/eol-spaces-bidi-002.html.ini  |    2 +
 .../white-space/trailing-ogham-001.html.ini   |    2 +
 .../white-space/trailing-ogham-002.html.ini   |    2 +
 .../white-space/trailing-ogham-003.html.ini   |    2 +
 .../appearance-button-002.tentative.html.ini  |    2 -
 ...t-appearance-button-002.tentative.html.ini |    2 -
 .../css/cssom-view/CaretPosition-001.html.ini |    4 -
 .../cssom-view/elementFromPoint-001.html.ini  |    4 -
 .../elementsFromPoint-iframes.html.ini        |    3 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 +
 .../matchMedia-display-none-iframe.html.ini   |    2 +
 .../css/cssom/CSSCounterStyleRule.html.ini    |    4 +
 .../css/cssom/CSSFontFaceRule.html.ini        |    4 +
 ...backdrop-filter-svg-foreignObject.html.ini |    2 +
 .../mediaqueries/prefers-contrast.html.ini    |   12 +
 .../CustomElementRegistry.html.ini            |   15 +
 .../dom/events/Event-dispatch-click.html.ini  |    6 +
 .../api/request/request-structure.html.ini    |    3 -
 .../fetch/content-type/response.window.js.ini |   27 +-
 .../fetch/content-type/script.window.js.ini   |    2 +-
 .../embed.https.sub.tentative.html.ini        |   20 +
 .../stale-image.html.ini                      |    3 +-
 .../api/document-fullscreen-enabled.html.ini  |    4 +
 .../failure-check-sequence.https.html.ini     |   13 +
 .../traverse_the_history_3.html.ini}          |    2 +-
 ...ross-origin-objects-on-new-window.html.ini |    2 +
 ...creating_browsing_context_test_01.html.ini |    4 +
 .../canvas-createImageBitmap-e_srgb.html.ini  |  107 +-
 ...reatePutGetImageData-colorManaged.html.ini |   18 -
 .../imageData-colorSpace.html.ini             |   19 -
 .../images/bypass-cache-revalidation.html.ini |    4 +
 .../html/dom/idlharness.https.html.ini        |   33 +
 .../html/dom/idlharness.worker.js.ini         |   18 +-
 .../supported-elements.html.ini               |    3 +-
 .../fieldset-overflow-cssomview.html.ini      |    4 +
 .../hash-name-reference.html.ini              |    3 -
 .../no-cuechange-before-play.html.ini         |    4 +
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    1 +
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 ...ge-compositing-large-scale-change.html.ini |    2 +
 .../reload.window.js.ini                      |    5 +
 .../protocol.https.html.ini                   |   54 +
 .../protocol.tentative.https.html.ini         |   55 +
 ...evented-with-reference.optional.any.js.ini |    5 +
 ...vented-with-unregister.optional.any.js.ini |    5 +
 ...o-call-cleanupCallback.optional.any.js.ini |    5 +
 ...ldings-multiple-values.optional.any.js.ini |   57 +
 .../weakrefs/reentrancy.optional.any.js.ini   |    5 +
 ...turn-undefined-with-gc.optional.any.js.ini |    5 +
 ...gister-cleaned-up-cell.optional.any.js.ini |    5 +
 .../contenteditable/collapse.html.ini         |   10 +
 .../contenteditable/modify.tentative.html.ini |    4 +
 .../metadata/url/a-element-xhtml.xhtml.ini    |   36 +
 tests/wpt/metadata/url/a-element.html.ini     |   36 +
 .../wpt/metadata/url/url-constructor.html.ini |   36 +
 tests/wpt/metadata/url/url-setters.html.ini   |    1 +
 .../wasm/jsapi/memory/constructor.any.js.ini  |    6 +
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 ...workletnode-with-parameters.https.html.ini |    2 +
 .../delay-test.html.ini                       |   13 +
 .../tests/execute_script/execute.py.ini       |    3 +
 .../webstorage/idlharness.window.js.ini       |    4 -
 .../hand-input/idlharness.https.window.js.ini |  229 +
 .../workers/WorkerGlobalScope-close.html.ini  |    4 -
 .../workers/Worker_script_mimetype.htm.ini    |    4 +
 .../Worker/Worker-constructor.html.ini        |    2 -
 .../message-classic-DOMException.html.ini     |    8 +
 .../onerror/message-classic-Error.html.ini    |    8 +
 .../message-module-DOMException.html.ini      |    8 +
 .../onerror/message-module-Error.html.ini     |    8 +
 .../web-platform-tests/.azure-pipelines.yml   |    8 +-
 .../.github/workflows/regen_certs.yml         |   33 +
 .../FileAPI/file/File-constructor.html        |    3 +-
 .../FileAPI/idlharness-manual.html            |   49 +-
 .../DOMException-custom-bindings.any.js       |    6 +-
 .../WebIDL/idlharness.any.js                  |   16 +
 .../web-platform-tests/WebIDL/idlharness.html |   28 -
 .../bluetooth/resources/bluetooth-test.js     |   67 +-
 .../async-svg-script-removal.https.html       |   57 +
 .../async-write-svg-read-svg.https.html       |   56 +
 .../security-features/subresource/svg.py      |    4 +-
 .../web-platform-tests/common/stringifiers.js |    2 +-
 .../contacts/contacts-select.https.window.js  |    1 +
 .../contacts/resources/helpers.js             |   36 +-
 .../subsumption_algorithm-general.html        |   34 +
 .../frame-src-same-document-meta.sub.html     |    4 +-
 .../frame-src-same-document.sub.html          |    7 +-
 ...scriptions_multiple.tentative.https.any.js |    9 +-
 ...ubscriptions_single.tentative.https.any.js |    5 +-
 ...tore_event_basic.tentative.https.window.js |    4 +
 ...re_getAll_arguments.tentative.https.any.js |   91 +-
 ...Store_get_arguments.tentative.https.any.js |   80 +-
 ...re_get_delete_basic.tentative.https.any.js |    2 +-
 ...ieStore_opaque_origin.tentative.https.html |    2 +-
 ...subscribe_arguments.tentative.https.any.js |   17 +-
 .../resources/helper_iframe.sub.html          |    2 +-
 ...e_subscriptions_reset.tentative.https.html |    4 +-
 ...atched_subscription.tentative.https.any.js |    4 +-
 ...tiple_subscriptions.tentative.https.any.js |    6 +-
 ...pping_subscriptions.tentative.https.any.js |    4 +-
 ...single_subscription.tentative.https.any.js |    4 +-
 ...single_subscription.tentative.https.any.js |    4 +-
 .../positioning/bottom-offset-001-ref.xht     |    4 +-
 .../svg/mix-blend-mode-svg-rectangle.html     |    4 +-
 .../mix-blend-mode-svg-rectangle-ref.html     |    3 +
 .../event-dispatch.tentative.html             |   13 +
 .../border-radius-012-ref.html                |   13 +
 .../css-backgrounds/border-radius-012.html    |   14 +
 .../border-width-small-values-001-a.html      |    8 +
 .../border-width-small-values-001-b.html      |    8 +
 .../border-width-small-values-001-c.html      |    8 +
 .../border-width-small-values-001-d.html      |    8 +
 .../border-width-small-values-001-e.html      |    8 +
 .../css3-border-image-repeat-repeat.html      |   41 +-
 .../css3-border-image-repeat-stretch.html     |   41 +-
 .../inline-background-rtl-001.html            |   25 +
 .../border-width-small-values-001-ref.html    |    5 +
 .../css3-border-image-repeat-repeat-ref.html  |  137 +-
 .../css3-border-image-repeat-stretch-ref.html |  123 +-
 .../inline-background-rtl-001-ref.html        |   19 +
 .../support/blue-diamond-27x27.png            |  Bin 0 -> 285 bytes
 .../support/new-red-diamond-27x27.png         |  Bin 0 -> 372 bytes
 .../css/css-break/borders-000-ref.html        |    4 +
 .../css/css-break/borders-000.html            |    9 +
 .../css/css-break/borders-001-ref.html        |    7 +
 .../css/css-break/borders-001.html            |   11 +
 .../css/css-break/borders-002-ref.html        |    8 +
 .../css/css-break/borders-002.html            |   11 +
 .../css/css-break/borders-003-ref.html        |   37 +
 .../css/css-break/borders-003.html            |   10 +
 .../css/css-break/borders-004-ref.html        |   37 +
 .../css/css-break/borders-004.html            |   10 +
 .../css/css-break/borders-005-ref.html        |   37 +
 .../css/css-break/borders-005.html            |   10 +
 .../css/css-break/borders-006-ref.html        |   22 +
 .../css/css-break/borders-006.html            |   10 +
 .../css/css-break/borders-007-ref.html        |   22 +
 .../css/css-break/borders-007.html            |   10 +
 ...k-nested-float-in-table-001-print-ref.html |   26 +
 ...break-nested-float-in-table-001-print.html |   45 +
 .../css/css-break/fieldset-002-ref.html       |    8 +
 .../css/css-break/fieldset-002.html           |   10 +
 .../css/css-break/fieldset-003-ref.html       |   12 +
 .../css/css-break/fieldset-003.html           |   13 +
 .../css/css-break/fieldset-004-ref.html       |   13 +
 .../css/css-break/fieldset-004.html           |   14 +
 .../css/css-cascade/all-prop-001-ref.html     |   17 +-
 .../css/css-cascade/all-prop-001.html         |   55 +-
 .../css-cascade/import-conditional-001.html   |   30 +
 .../css/css-cascade/important-prop.html       |   22 +-
 .../important-transition-manual.html          |   25 +
 .../css/css-cascade/support/test-green.css    |    4 +
 .../css/css-cascade/support/test-red.css      |    4 +
 .../css/css-cascade/unset-val-001.html        |    9 +-
 .../content-visibility-026.html               |   66 +-
 ...k-nested-float-in-flex-item-001-print.html |    2 +-
 ...k-nested-float-in-flex-item-002-print.html |    2 +-
 ...k-nested-float-in-flex-item-print-ref.html |    2 +-
 .../canvas-dynamic-change-001.html            |    6 +-
 .../flex-aspect-ratio-img-row-006.html        |   15 +
 .../table-with-percent-intrinsic-width.html   |   67 +
 ...downloadable-font-in-iframe-print-ref.html |   24 +
 .../downloadable-font-in-iframe-print.html    |   26 +
 .../downloadable-font-print-ref.html          |   23 +
 .../css-fonts/downloadable-font-print.html    |   25 +
 .../css/css-fonts/resources/markA.ttf         |  Bin 0 -> 1568 bytes
 .../css/css-fonts/resources/markB.ttf         |  Bin 0 -> 1568 bytes
 .../grid-self-baseline-008-ref.html           |   12 +
 .../self-baseline/grid-self-baseline-008.html |   39 +
 .../grid-intrinsic-track-sizes-001.html       |   75 +-
 ...image-orientation-background-position.html |   43 +
 ...e-orientation-background-position-ref.html |   41 +
 .../css-lists/counter-list-item-2-ref.html    |   24 +
 .../css/css-lists/counter-list-item-2.html    |   24 +
 .../css-lists/counter-list-item-3-ref.html    |   24 +
 .../css/css-lists/counter-list-item-3.html    |   24 +
 ...ath-rotated-will-change-transform-ref.html |    4 +
 ...ip-path-rotated-will-change-transform.html |   11 +
 .../clip/clip-no-stacking-context-ref.html    |    4 +
 .../clip/clip-no-stacking-context.html        |   36 +
 .../spanning-legend-000-crash.html            |    8 +
 .../spanning-legend-001-crash.html            |    9 +
 .../css/css-overflow/clip-001.html            |    1 -
 .../css/css-overflow/clip-002-ref.html        |   35 +
 .../css/css-overflow/clip-002.html            |   39 +
 .../css/css-overflow/clip-003-ref.html        |   61 +
 .../css/css-overflow/clip-003.html            |   63 +
 .../css/css-overflow/clip-004-ref.html        |   35 +
 .../css/css-overflow/clip-004.html            |   40 +
 .../css/css-overflow/clip-005-ref.html        |   36 +
 .../css/css-overflow/clip-005.html            |   41 +
 .../dynamic-visible-to-clip-001.html          |    1 -
 .../overflow-body-propagation-007.html        |    1 -
 .../overflow-body-propagation-008.html        |    1 -
 .../overflow-body-propagation-009.html        |    1 -
 .../parsing/overflow-computed.html            |    2 +
 .../css-overflow/scrollbar-gutter-001.html    |  187 +
 .../css-overflow/scrollbar-gutter-002.html    |  187 +
 .../css-overflow/scrollbar-gutter-003.html    |  187 +
 .../css-overflow/scrollbar-gutter-004.html    |  187 +
 .../css-overflow/scrollbar-gutter-005.html    |  187 +
 ...ion-absolute-large-negative-inset-ref.html |    9 +
 ...osition-absolute-large-negative-inset.html |   26 +
 ...osition-fixed-scroll-nested-fixed-ref.html |    3 +
 .../position-fixed-scroll-nested-fixed.html   |   14 +
 .../css/css-pseudo/active-selection-031.html  |    2 +-
 .../file-chooser-button-001.tentative.html    |   11 -
 ...l => file-selector-button-001-notref.html} |    0
 .../file-selector-button-001.tentative.html   |   11 +
 ...utton-display-toggle-crash.tentative.html} |    4 +-
 .../css-pseudo/marker-content-023-ref.html    |   33 +
 .../css/css-pseudo/marker-content-023.html    |   46 +
 .../css/css-pseudo/marker-default-styles.html |    7 +-
 .../css/css-pseudo/marker-hyphens-ref.html    |   26 +
 .../css/css-pseudo/marker-hyphens.html        |   44 +
 .../marker-letter-spacing-ref-001.html        |   63 +
 .../marker-letter-spacing-ref-002.html        |   63 +
 .../css/css-pseudo/marker-letter-spacing.html |   74 +
 .../css/css-pseudo/marker-line-break-ref.html |   23 +
 .../css/css-pseudo/marker-line-break.html     |   62 +
 .../css/css-pseudo/marker-overflow-wrap.html  |   62 +
 .../css/css-pseudo/marker-tab-size-ref.html   |   49 +
 .../css/css-pseudo/marker-tab-size.html       |   57 +
 .../css/css-pseudo/marker-text-align-ref.html |   58 +
 .../css/css-pseudo/marker-text-align.html     |   62 +
 .../marker-text-decoration-skip-ink-ref.html  |   39 +
 .../marker-text-decoration-skip-ink.html      |   53 +
 .../css-pseudo/marker-text-emphasis-ref.html  |   44 +
 .../css/css-pseudo/marker-text-emphasis.html  |   58 +
 .../css-pseudo/marker-text-shadow-ref.html    |   23 +
 .../css/css-pseudo/marker-text-shadow.html    |   38 +
 .../css/css-pseudo/marker-word-break-ref.html |   23 +
 .../css/css-pseudo/marker-word-break.html     |   62 +
 .../css-pseudo/marker-word-spacing-ref.html   |   63 +
 .../css/css-pseudo/marker-word-spacing.html   |   71 +
 ...ker-supported-properties-in-animation.html |   82 +-
 .../parsing/marker-supported-properties.html  |   17 +-
 .../placeholder-input-dynamic-crash.html      |   10 +
 .../reference/active-selection-031-ref.html   |    2 +-
 ...selection-overlay-and-grammar-001-ref.html |   71 +
 ...election-overlay-and-spelling-001-ref.html |   62 +
 .../selection-overlay-and-grammar-001.html    |   90 +
 .../selection-overlay-and-spelling-001.html   |  102 +
 .../focus-prioritized.html                    |    2 +-
 .../flexbox-scrolling-vertical-rl.html        |   20 +
 .../support/scrolling-vertical-rl.html        |   18 +
 .../vertical-rl-viewport-size-change-000.html |   21 +
 .../vertical-rl-viewport-size-change-001.html |   21 +
 .../assorted}/float-retry-push-circle.html    |    2 +-
 .../assorted}/float-retry-push-image.html     |    2 +-
 .../assorted}/float-retry-push-inset.html     |    2 +-
 .../assorted}/float-retry-push-polygon.html   |    2 +-
 .../assorted}/float-should-push.html          |    2 +-
 .../reference}/float-retry-push-ref.html      |    0
 .../reference}/float-should-push-ref.html     |    0
 .../shape-outside-border-box-001-ref.html     |    0
 .../shape-outside-border-box-002-ref.html     |    0
 ...side-border-box-border-radius-001-ref.html |    0
 ...side-border-box-border-radius-002-ref.html |    0
 ...side-border-box-border-radius-003-ref.html |    0
 ...side-border-box-border-radius-004-ref.html |    0
 ...side-border-box-border-radius-005-ref.html |    0
 ...side-border-box-border-radius-006-ref.html |    0
 ...side-border-box-border-radius-007-ref.html |    0
 ...side-border-box-border-radius-008-ref.html |    0
 ...side-border-box-border-radius-009-ref.html |    0
 ...side-border-box-border-radius-010-ref.html |    0
 ...side-border-box-border-radius-011-ref.html |    0
 ...side-border-box-border-radius-012-ref.html |    0
 .../shape-outside-content-box-001-ref.html    |    0
 .../shape-outside-content-box-002-ref.html    |    0
 ...ide-content-box-border-radius-001-ref.html |    0
 ...ide-content-box-border-radius-002-ref.html |    0
 .../shape-outside-margin-box-001-ref.html     |    0
 .../shape-outside-margin-box-002-ref.html     |    0
 ...side-margin-box-border-radius-001-ref.html |    0
 ...side-margin-box-border-radius-002-ref.html |    0
 ...side-margin-box-border-radius-003-ref.html |    0
 ...side-margin-box-border-radius-004-ref.html |    0
 ...side-margin-box-border-radius-005-ref.html |    0
 ...side-margin-box-border-radius-006-ref.html |    0
 ...side-margin-box-border-radius-007-ref.html |    0
 ...side-margin-box-border-radius-008-ref.html |    0
 .../shape-outside-padding-box-001-ref.html    |    0
 .../shape-outside-padding-box-002-ref.html    |    0
 ...ide-padding-box-border-radius-001-ref.html |    0
 ...ide-padding-box-border-radius-002-ref.html |    0
 .../shape-outside-border-box-001.html         |    2 +-
 .../shape-outside-border-box-002.html         |    2 +-
 ...-outside-border-box-border-radius-001.html |    2 +-
 ...-outside-border-box-border-radius-002.html |    2 +-
 ...-outside-border-box-border-radius-003.html |    2 +-
 ...-outside-border-box-border-radius-004.html |    2 +-
 ...-outside-border-box-border-radius-005.html |    2 +-
 ...-outside-border-box-border-radius-006.html |    2 +-
 ...-outside-border-box-border-radius-007.html |    2 +-
 ...-outside-border-box-border-radius-008.html |    2 +-
 ...-outside-border-box-border-radius-009.html |    2 +-
 ...-outside-border-box-border-radius-010.html |    2 +-
 ...-outside-border-box-border-radius-011.html |    2 +-
 ...-outside-border-box-border-radius-012.html |    2 +-
 .../shape-outside-content-box-001.html        |    2 +-
 .../shape-outside-content-box-002.html        |    2 +-
 ...outside-content-box-border-radius-001.html |    2 +-
 ...outside-content-box-border-radius-002.html |    2 +-
 .../shape-outside-margin-box-001.html         |    2 +-
 .../shape-outside-margin-box-002.html         |    2 +-
 ...-outside-margin-box-border-radius-001.html |    2 +-
 ...-outside-margin-box-border-radius-002.html |    2 +-
 ...-outside-margin-box-border-radius-003.html |    2 +-
 ...-outside-margin-box-border-radius-004.html |    2 +-
 ...-outside-margin-box-border-radius-005.html |    2 +-
 ...-outside-margin-box-border-radius-006.html |    2 +-
 ...-outside-margin-box-border-radius-007.html |    2 +-
 ...-outside-margin-box-border-radius-008.html |    2 +-
 .../shape-outside-padding-box-001.html        |    2 +-
 .../shape-outside-padding-box-002.html        |    2 +-
 ...outside-padding-box-border-radius-001.html |    2 +-
 ...outside-padding-box-border-radius-002.html |    2 +-
 .../shape-outside-circle-032-ref.html         |    0
 .../shape-outside-circle-033-ref.html         |    0
 .../shape-outside-circle-034-ref.html         |    0
 .../shape-outside-circle-035-ref.html         |    0
 .../shape-outside-circle-036-ref.html         |    0
 .../shape-outside-circle-041-ref.html         |    0
 .../shape-outside-circle-042-ref.html         |    0
 .../shape-outside-circle-047-ref.html         |    0
 .../shape-outside-circle-048-ref.html         |    0
 .../shape-outside-circle-049-ref.html         |    0
 .../shape-outside-circle-050-ref.html         |    0
 .../shape-outside-circle-051-ref.html         |    0
 .../shape-outside-circle-052-ref.html         |    0
 .../shape-outside-circle-053-ref.html         |    0
 .../shape-outside-circle-054-ref.html         |    0
 .../shape-outside-circle-055-ref.html         |    0
 .../shape-outside-circle-056-ref.html         |    0
 .../circle}/shape-outside-circle-032.html     |    2 +-
 .../circle}/shape-outside-circle-033.html     |    2 +-
 .../circle}/shape-outside-circle-034.html     |    2 +-
 .../circle}/shape-outside-circle-035.html     |    2 +-
 .../circle}/shape-outside-circle-036.html     |    2 +-
 .../circle}/shape-outside-circle-037.html     |    2 +-
 .../circle}/shape-outside-circle-038.html     |    2 +-
 .../circle}/shape-outside-circle-041.html     |    2 +-
 .../circle}/shape-outside-circle-042.html     |    2 +-
 .../circle}/shape-outside-circle-043.html     |    2 +-
 .../circle}/shape-outside-circle-044.html     |    2 +-
 .../circle}/shape-outside-circle-047.html     |    2 +-
 .../circle}/shape-outside-circle-048.html     |    2 +-
 .../circle}/shape-outside-circle-049.html     |    2 +-
 .../circle}/shape-outside-circle-050.html     |    2 +-
 .../circle}/shape-outside-circle-051.html     |    2 +-
 .../circle}/shape-outside-circle-052.html     |    2 +-
 .../circle}/shape-outside-circle-053.html     |    2 +-
 .../circle}/shape-outside-circle-054.html     |    2 +-
 .../circle}/shape-outside-circle-055.html     |    2 +-
 .../circle}/shape-outside-circle-056.html     |    2 +-
 .../shape-outside-ellipse-032-ref.html        |    0
 .../shape-outside-ellipse-033-ref.html        |    0
 .../shape-outside-ellipse-034-ref.html        |    0
 .../shape-outside-ellipse-035-ref.html        |    0
 .../shape-outside-ellipse-036-ref.html        |    0
 .../shape-outside-ellipse-037-ref.html        |    0
 .../shape-outside-ellipse-038-ref.html        |    0
 .../shape-outside-ellipse-039-ref.html        |    0
 .../shape-outside-ellipse-040-ref.html        |    0
 .../shape-outside-ellipse-042-ref.html        |    0
 .../shape-outside-ellipse-044-ref.html        |    0
 .../shape-outside-ellipse-045-ref.html        |    0
 .../shape-outside-ellipse-046-ref.html        |    0
 .../shape-outside-ellipse-047-ref.html        |    0
 .../shape-outside-ellipse-048-ref.html        |    0
 .../shape-outside-ellipse-049-ref.html        |    0
 .../shape-outside-ellipse-050-ref.html        |    0
 .../shape-outside-ellipse-051-ref.html        |    0
 .../shape-outside-ellipse-052-ref.html        |    0
 .../ellipse}/shape-outside-ellipse-032.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-033.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-034.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-035.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-036.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-037.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-038.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-039.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-040.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-041.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-042.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-043.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-044.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-045.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-046.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-047.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-048.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-049.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-050.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-051.html   |    2 +-
 .../ellipse}/shape-outside-ellipse-052.html   |    2 +-
 .../shape-outside-inset-016-ref.html          |    0
 .../shape-outside-inset-017-ref.html          |    0
 .../shape-outside-inset-020-ref.html          |    0
 .../shape-outside-inset-021-ref.html          |    0
 .../shape-outside-inset-022-ref.html          |    0
 .../shape-outside-inset-023-ref.html          |    0
 .../shape-outside-inset-024-ref.html          |    0
 .../shape-outside-inset-025-ref.html          |    0
 .../shape-outside-inset-026-ref.html          |    0
 .../shape-outside-inset-027-ref.html          |    0
 .../inset}/shape-outside-inset-016.html       |    2 +-
 .../inset}/shape-outside-inset-017.html       |    2 +-
 .../inset}/shape-outside-inset-020.html       |    2 +-
 .../inset}/shape-outside-inset-021.html       |    2 +-
 .../inset}/shape-outside-inset-022.html       |    2 +-
 .../inset}/shape-outside-inset-023.html       |    2 +-
 .../inset}/shape-outside-inset-024.html       |    2 +-
 .../inset}/shape-outside-inset-025.html       |    2 +-
 .../inset}/shape-outside-inset-026.html       |    2 +-
 .../inset}/shape-outside-inset-027.html       |    2 +-
 .../shape-outside-polygon-018-ref.html        |    0
 .../shape-outside-polygon-019-ref.html        |    0
 .../shape-outside-polygon-020-ref.html        |    0
 .../shape-outside-polygon-021-ref.html        |    0
 .../shape-outside-polygon-022-ref.html        |    0
 .../shape-outside-polygon-023-ref.html        |    0
 .../shape-outside-polygon-024-ref.html        |    0
 .../shape-outside-polygon-025-ref.html        |    0
 .../shape-outside-polygon-032-ref.html        |    0
 .../polygon}/shape-outside-polygon-018.html   |    2 +-
 .../polygon}/shape-outside-polygon-019.html   |    2 +-
 .../polygon}/shape-outside-polygon-020.html   |    2 +-
 .../polygon}/shape-outside-polygon-021.html   |    2 +-
 .../polygon}/shape-outside-polygon-022.html   |    2 +-
 .../polygon}/shape-outside-polygon-023.html   |    2 +-
 .../polygon}/shape-outside-polygon-024.html   |    2 +-
 .../polygon}/shape-outside-polygon-025.html   |    2 +-
 .../polygon}/shape-outside-polygon-032.html   |    2 +-
 .../values/shape-margin-000.html              |    4 +-
 .../values/shape-margin-001.html              |    4 +-
 .../values/shape-margin-002.html              |    4 +-
 ...-with-margin-collapsing-001.tentative.html |   15 +
 ...-with-margin-collapsing-002.tentative.html |   14 +
 .../flex-aspect-ratio-011.tentative.html      |   12 +
 .../flex-aspect-ratio-012.tentative.html      |   12 +
 .../flex-aspect-ratio-013.tentative.html      |   12 +
 .../flex-aspect-ratio-014.tentative.html      |   12 +
 .../ref-filled-green-100x20-rect.html         |    4 +
 .../replaced-element-015.tentative.html       |    9 +
 .../replaced-element-016.tentative.html       |    9 +
 .../replaced-element-017.tentative.html       |   18 +
 .../replaced-element-018.tentative.html       |    9 +
 .../replaced-element-019.tentative.html       |    7 +
 .../replaced-element-020.tentative.html       |   10 +
 .../replaced-element-021.tentative.html       |   10 +
 ...s-1252-http-windows-1251-css-utf8-bom.html |   17 +
 .../support/utf8-bom-http-windows-1251.css    |    1 +
 .../utf8-bom-http-windows-1251.css.headers    |    1 +
 .../absolute-tables-008.tentative.html        |   25 +
 .../absolute-tables-009.tentative.html        |   25 +
 .../absolute-tables-010.tentative.html        |   26 +
 .../absolute-tables-011.tentative.html        |   25 +
 .../css/css-tables/absolute-tables-012.html   |    9 +
 .../css/css-tables/table-model-fixup-2.html   |  265 +-
 .../animations/tab-size-interpolation.html    |  125 +
 .../tab-size/tab-size-inline-001-ref.html     |   16 +
 .../tab-size/tab-size-inline-001.html         |   28 +
 .../tab-size/tab-size-inline-002-ref.html     |   20 +
 .../tab-size/tab-size-inline-002.html         |   28 +
 .../tab-size/tab-size-integer-004-ref.html    |   18 +
 .../tab-size/tab-size-integer-004.html        |   30 +
 .../white-space/eol-spaces-bidi-001.html      |   54 +-
 .../white-space/eol-spaces-bidi-002.html      |   69 +
 .../reference/eol-spaces-bidi-001-ref.html    |   45 +-
 .../reference/eol-spaces-bidi-002-ref.html    |   48 +
 .../reference/trailing-ogham-001-ref.html     |   19 +
 .../white-space/trailing-ogham-001.html       |   22 +
 .../white-space/trailing-ogham-002.html       |   23 +
 .../white-space/trailing-ogham-003.html       |   23 +
 .../changing-while-transition-004.html        |   57 +
 .../css-transitions/transition-delay-001.html |    6 +-
 .../transition-duration-001.html              |    6 +-
 .../css/css-ui/appearance-button-001-ref.html |   22 -
 .../css/css-ui/appearance-button-001.html     |    7 +-
 .../appearance-button-002.tentative-ref.html  |    4 -
 .../appearance-button-002.tentative.html      |   16 -
 ...-appearance-auto-input-non-widget-001.html |   16 +
 .../css-ui/webkit-appearance-button-001.html  |    7 +-
 ...ebkit-appearance-button-002.tentative.html |   16 -
 .../webkit-appearance-progress-bar-002.html   |   20 +
 .../viewport-units-001-print-ref.html         |   13 +
 .../css-values/viewport-units-001-print.html  |   17 +
 .../will-change-stacking-context-003-ref.html |   11 +
 .../will-change-stacking-context-003.html     |   36 +
 .../client-props-root-display-none-crash.html |   17 +
 .../scroll-behavior-main-frame-root.html      |    1 +
 .../scroll-behavior-subframe-window.html      |    1 +
 .../css/cssom/CSSCounterStyleRule.html        |   21 +
 .../css/cssom/CSSFontFaceRule.html            |   21 +
 .../cssom/removerule-invalidation-crash.html  |   16 +
 .../backdrop-filter-svg-foreignObject.html    |   38 +
 .../css/mediaqueries/prefers-contrast.html    |   12 +-
 .../css/selectors/focus-visible-007.html      |    2 +-
 .../css/selectors/focus-visible-011.html      |    2 +-
 .../background/reftest.list                   |    1 +
 .../mozilla-central-reftests/reftest.list     |    3 -
 .../shapes1/reftest.list                      |  111 -
 .../shapes1/support/Ahem.ttf                  |  Bin 12480 -> 0 bytes
 ...-container-with-min-or-max-content-2b.html |    2 +-
 .../CustomElementRegistry.html                |   38 +-
 tests/wpt/web-platform-tests/docs/Makefile    |    4 +-
 .../web-platform-tests/docs/admin/index.md    |   12 +-
 .../docs/admin/pywebsocket3.rst               |   91 +
 tests/wpt/web-platform-tests/docs/conf.py     |   24 +-
 tests/wpt/web-platform-tests/docs/make.bat    |    3 +
 .../docs/running-tests/from-local-system.md   |    7 +-
 .../docs/writing-tests/idlharness.md          |  175 +-
 .../docs/writing-tests/server-pipes.md        |    8 +
 .../docs/writing-tests/testharness-api.md     |   35 +-
 .../docs/writing-tests/testharness.md         |  227 +-
 .../document-policy/echo-policy-nested.html   |    2 +-
 .../echo-policy-nested.html.headers           |    2 +-
 .../document-write.tentative.html             |   10 +-
 .../resources/async-script.js                 |    0
 .../resources/defer-script.js                 |    0
 .../resources/document-write-allowed.html}    |    0
 .../resources/document-write-disallowed.html  |   37 +
 .../document-write-disallowed.html.headers    |    1 +
 .../resources/parser-blocking-script.js       |    0
 .../resources/sync-script-test.js             |    0
 .../sync-script.tentative.https.sub.html      |    8 +-
 ...nc-script.tentative.https.sub.html.headers |    1 +
 ...document-write-report-only-tentative.html} |    4 +-
 ...t-write-report-only-tentative.html.headers |    1 +
 .../document-write-reporting-tentative.html}  |    4 +-
 ...ent-write-reporting-tentative.html.headers |    1 +
 ...s-max-bpp-reporting-onload-tentative.html} |    2 +-
 ...pp-reporting-onload-tentative.html.headers |    1 +
 ...y-images-max-bpp-reporting-tentative.html} |    2 +-
 ...s-max-bpp-reporting-tentative.html.headers |    1 +
 ...oversized-images-reporting-tentative.html} |    0
 ...d-images-reporting-tentative.html.headers} |    0
 ...lossy-images-reporting-onload.html.headers |    1 -
 ...imized-lossy-images-reporting.html.headers |    1 -
 ...=> unsized-media-reporting-tentative.html} |    0
 ...ed-media-reporting-tentative.html.headers} |    0
 .../required-policy/document-policy.html      |    4 +-
 .../document-policy.html.headers              |    2 +-
 .../required-document-policy-nested.html      |   12 +-
 .../required-document-policy.html             |   12 +-
 .../required-document-policy.html.headers     |    2 +-
 .../separate-document-policies.html           |   12 +-
 .../separate-document-policies.html.headers   |    4 +-
 .../dom/events/Event-dispatch-click.html      |   48 +
 .../Event-dispatch-click.tentative.html       |   52 +
 ...ecursive-exec-command-calls.tentative.html |   37 +
 .../entries-api/idlharness-manual.html        |   54 -
 .../entries-api/idlharness-manual.window.js   |   46 +
 .../entries-api/idlharness.html               |   39 -
 .../entries-api/idlharness.window.js          |   15 +
 .../web-platform-tests/eventsource/README.md  |    2 +
 .../eventsource/idlharness.html               |   74 -
 .../feature-policy/README.md                  |    2 +-
 ...nc-script.tentative.https.sub.html.headers |    1 -
 .../document-write-report-only.html.headers   |    1 -
 .../document-write-reporting.html.headers     |    1 -
 .../api/basic/request-headers-nonascii.any.js |   27 +
 .../fetch/api/request/request-structure.html  |    2 +-
 .../response-body-read-task-handling.html     |   54 +
 .../fetch/http-cache/cache-mode.html          |   72 +
 ...ub.html => embed.https.sub.tentative.html} |    5 +
 .../fetch/metadata/portal.https.sub.html      |    9 +-
 .../fetch/metadata/resources/post-to-owner.py |   12 +-
 .../fetch/range/sw.https.window.js            |    4 +-
 .../stale-while-revalidate/stale-image.html   |   11 +-
 .../web-platform-tests/font-access/README.md  |    2 +
 ...font_access-blob.tentative.https.window.js |    4 +
 ...cess-enumeration.tentative.https.window.js |    4 +
 .../resources/test-expectations.js            |  481 +
 .../resources/window-tests-blob.js            |   38 +
 .../resources/window-tests-enumeration.js     |   33 +
 .../forced-colors-mode-backplate-11-ref.html  |   11 +
 .../forced-colors-mode-backplate-11.html      |   20 +
 .../forced-colors-mode-03.html                |    4 +-
 .../forced-colors-mode-08-ref.html            |    8 +-
 .../forced-colors-mode-08.html                |    8 +-
 .../forced-colors-mode-17-ref.html            |    1 +
 .../forced-colors-mode-17.html                |    1 +
 .../forced-colors-mode-28.html                |    9 +-
 .../forced-colors-mode-29-ref.html            |   41 +
 .../forced-colors-mode-29.html                |   42 +
 .../forced-colors-mode-30-ref.html            |   18 +
 .../forced-colors-mode-30.html                |   19 +
 .../forced-colors-mode-31-ref.html            |   18 +
 .../forced-colors-mode-31.html                |   22 +
 .../forced-colors-mode-32.html                |   22 +
 .../forced-colors-mode-33-ref.html            |   16 +
 .../forced-colors-mode-33.html                |   23 +
 .../forced-colors-mode-34-ref.html            |   16 +
 .../forced-colors-mode-34.html                |   23 +
 .../forced-colors-mode-35-ref.html            |   17 +
 .../forced-colors-mode-35.html                |   23 +
 .../forced-colors-mode-36-ref.html            |   18 +
 .../forced-colors-mode-36.html                |   23 +
 .../forced-colors-mode-37-ref.html            |   18 +
 .../forced-colors-mode-37.html                |   24 +
 .../forced-colors-mode-38-ref.html            |   18 +
 .../forced-colors-mode-38.html                |   24 +
 .../forced-colors-mode-39-ref.html            |   16 +
 .../forced-colors-mode-39.html                |   17 +
 .../api/document-fullscreen-enabled.html      |   10 +-
 .../generic-sensor-feature-policy-test.sub.js |   26 +-
 .../generic-sensor-iframe-tests.sub.js        |    6 +-
 .../generic-sensor/generic-sensor-tests.js    |  123 +-
 .../resources/generic-sensor-helpers.js       |   52 +-
 tests/wpt/web-platform-tests/html/README.md   |    1 +
 .../navigating-across-documents/010.html      |    2 +-
 .../failure-check-sequence.https.html         |   76 +
 .../cross-origin-objects.html                 |    6 +-
 .../proxy-getOwnPropertyDescriptor.html       |    8 +-
 .../windows/iframe-nested-print-ref.html      |    9 +
 .../browsers/windows/iframe-nested-print.html |    6 +
 .../canvas-createImageBitmap-e_srgb.html      |  201 +-
 ...as-createPutGetImageData-colorManaged.html |   22 +-
 .../canvas-getImageData-e_srgb.html           |   32 +-
 .../imageData-colorManagedBehavior.html       |   23 -
 .../imageData-colorSpace.html                 |   71 -
 .../offscreencanvas.commit.html               |    5 +-
 ...rage-reporting-dedicated-worker.https.html |    8 +-
 ...ache-storage-reporting-document.https.html |    8 +-
 ...torage-reporting-service-worker.https.html |    8 +-
 ...storage-reporting-shared-worker.https.html |    8 +-
 ...ross-origin-isolated-permission.https.html |   61 +
 ...gin-isolated-permission.https.html.headers |    2 +
 .../header-parsing.https.html                 |   84 +
 .../none-sw-from-none.https.html              |    6 +-
 .../none-sw-from-require-corp.https.html      |    7 +-
 .../none.https.html                           |    5 +
 .../reporting-navigation.https.html           |   24 +-
 .../reporting-subresource-corp.https.html     |   41 +-
 .../reporting-to-endpoint.https.html          |   29 +-
 .../require-corp-sw-from-none.https.html      |    7 +-
 ...quire-corp-sw-from-require-corp.https.html |    6 +-
 .../cross-origin-isolated-frame.html          |   10 +
 .../resources/empty-coep.py                   |    7 +
 .../coop-csp-sandbox-navigate.https.html      |   39 +
 .../coop-csp-sandbox.https.html               |   24 +
 .../coop-sandbox.https.html                   |   13 +
 .../header-parsing.https.html                 |   52 +
 .../javascript-url.https.html                 |  262 +
 ...om-coop-page-to-openee_coop-ro.https.html} |    4 +-
 ...om-coop-page-to-opener_coop-ro.https.html} |    4 +-
 ...from-coop-page-to-other_coop-ro.https.html |   87 +
 ...-coop-page-from-openee_coop-ro.https.html} |    4 +-
 ...-coop-page-from-opener_coop-ro.https.html} |    4 +-
 ...to-coop-page-from-other_coop-ro.https.html |   75 +
 .../report-only-four-reports.https.html       |   22 +-
 .../report-only-from-unsafe-none.https.html   |   12 +-
 ...port-only-same-origin-report-to.https.html |   16 +-
 .../report-only-same-origin.https.html        |   12 +-
 .../reporting-coop-navigated-popup.https.html |   11 +-
 ...e-origin-allow-popups-report-to.https.html |   27 +-
 ...opup-same-origin-coep-report-to.https.html |   38 +-
 ...ing-popup-same-origin-report-to.https.html |   49 +-
 .../reporting-popup-same-origin.https.html    |   19 +-
 ...ing-popup-unsafe-none-report-to.https.html |   27 +-
 ...t-with-same-origin-allow-popups.https.html |    2 +-
 .../reporting/resources/reporting-common.js   |   21 +-
 .../resource-popup.https.html                 |   91 +
 .../resources/common.js                       |   33 +-
 .../resources/coop-coep.py                    |   29 +-
 .../resources/coop-same-origin-repeated.asis  |   24 +
 .../resources/csp-sandbox.py                  |   29 +
 .../javascript-url-same-origin.https.html     |   33 +
 .../resources/resource-cleanup.html           |   11 +
 .../resources/resource-popup.html             |   21 +
 .../images/bypass-cache-revalidation.html     |   37 +
 .../html/dom/elements/images/image.py         |   28 +
 .../html/dom/idlharness.https.html            |    6 +
 .../html/dom/idlharness.worker.js             |    3 +-
 .../query-encoding/resources/resolve-url.js   |  128 +-
 .../fieldset-overflow-cssomview.html          |   30 +
 ...multicol-legend-becomes-floated-crash.html |   11 +
 ...-legend-becomes-rendered-legend-crash.html |   20 +
 .../html/resources/common.js                  |    4 +-
 .../no-cuechange-before-play.html             |   27 +
 .../track-element/track-active-cues.html      |    2 +-
 ...ge-compositing-large-scale-change-ref.html |   15 +
 .../image-compositing-large-scale-change.html |   35 +
 .../sizes/implicit-sizes-ignores-width.html   |   19 +
 .../forms/the-input-element/datetime.html     |  112 +-
 .../defaultValue-clobbering-ref.html          |   24 -
 .../defaultValue-clobbering.html              |   21 +-
 .../forms/the-input-element/range.html        |  134 +-
 .../forms/the-input-element/search_input.html |   10 +-
 .../grouping-li-reftest-004-ref.html          |   23 +
 .../grouping-li-reftest-004.html              |   26 +
 .../grouping-li-reftest-005-ref.html          |   22 +
 .../grouping-li-reftest-005.html              |   25 +
 .../evaluation-order-2-import-worker.mjs      |    2 +-
 .../template-as-a-descendant.html             |   24 +-
 ...ng-stack-back-to-a-table-body-context.html |    3 +-
 ...learing-stack-back-to-a-table-context.html |    3 +-
 ...ing-stack-back-to-a-table-row-context.html |    3 +-
 .../template-owner-document.html              |    6 +-
 .../pageshow-event.window.js                  |   13 +
 .../the-navigator-object/protocol.https.html  |    9 +
 .../protocol.tentative.https.html             |   30 +
 .../idle-detection/idlharness.https.window.js |   41 +-
 .../idle-detection/interceptor.https.html     |   10 +-
 .../resources/idle-detection-helper.js        |   21 +
 .../resources/idlharness-worker.js            |    2 +-
 .../reftest/reftest_match-print-ref.html      |    2 +-
 ...get-target-ranges-backspace.tentative.html |  529 +-
 ...target-ranges-forwarddelete.tentative.html |  466 +-
 .../wpt/web-platform-tests/interfaces/CSP.idl |    4 +-
 .../interfaces/DOM-Parsing.idl                |    4 +-
 .../web-platform-tests/interfaces/FileAPI.idl |   16 +-
 .../interfaces/IndexedDB.idl                  |   20 +-
 .../wpt/web-platform-tests/interfaces/SRI.idl |    4 +-
 .../wpt/web-platform-tests/interfaces/SVG.idl |    4 +-
 .../interfaces/WebCryptoAPI.idl               |    4 +-
 .../web-platform-tests/interfaces/WebIDL.idl  |    6 +-
 .../interfaces/accelerometer.idl              |    4 +-
 .../interfaces/ambient-light.idl              |    4 +-
 .../web-platform-tests/interfaces/anchors.idl |    4 +-
 .../interfaces/appmanifest.idl                |    4 +-
 .../interfaces/audio-output.idl               |   12 +-
 .../interfaces/background-fetch.idl           |    4 +-
 .../interfaces/background-sync.idl            |    4 +-
 .../web-platform-tests/interfaces/badging.idl |    4 +-
 .../interfaces/battery-status.idl             |    4 +-
 .../web-platform-tests/interfaces/beacon.idl  |    4 +-
 .../interfaces/clipboard-apis.idl             |    8 +-
 .../web-platform-tests/interfaces/compat.idl  |    4 +-
 .../interfaces/compression.idl                |    4 +-
 .../web-platform-tests/interfaces/console.idl |   42 +-
 .../interfaces/construct-stylesheets.idl      |    4 +-
 .../interfaces/content-index.idl              |    4 +-
 .../interfaces/cookie-store.idl               |   34 +-
 .../interfaces/cors-rfc1918.idl               |    4 +-
 .../interfaces/credential-management.idl      |    4 +-
 .../interfaces/csp-embedded-enforcement.idl   |    4 +-
 .../interfaces/css-animation-worklet.idl      |    6 +-
 .../interfaces/css-animations.idl             |    8 +-
 .../interfaces/css-conditional.idl            |    4 +-
 .../interfaces/css-counter-styles.idl         |    4 +-
 .../interfaces/css-device-adapt.idl           |    4 +-
 .../interfaces/css-font-loading.idl           |    8 +-
 .../interfaces/css-fonts.idl                  |    7 +-
 .../interfaces/css-images.idl                 |    4 +-
 .../interfaces/css-layout-api.idl             |    4 +-
 .../interfaces/css-masking.idl                |    4 +-
 .../interfaces/css-paint-api.idl              |    6 +-
 .../interfaces/css-parser-api.idl             |    4 +-
 .../interfaces/css-properties-values-api.idl  |    6 +-
 .../interfaces/css-pseudo.idl                 |    4 +-
 .../interfaces/css-shadow-parts.idl           |    4 +-
 .../interfaces/css-transitions.idl            |    4 +-
 .../interfaces/css-typed-om.idl               |   12 +-
 .../interfaces/cssom-view.idl                 |   42 +-
 .../web-platform-tests/interfaces/cssom.idl   |   18 +-
 .../interfaces/custom-state-pseudo-class.idl  |    4 +-
 .../interfaces/deprecation-reporting.idl      |    4 +-
 .../interfaces/device-memory.idl              |    4 +-
 .../interfaces/dom-overlays.idl               |    4 +-
 .../wpt/web-platform-tests/interfaces/dom.idl |   94 +-
 .../interfaces/element-timing.idl             |    4 +-
 .../interfaces/encoding.idl                   |    4 +-
 .../interfaces/encrypted-media.idl            |   17 +-
 .../interfaces/entries-api.idl                |   22 +-
 .../interfaces/event-timing.idl               |    4 +-
 .../interfaces/feature-policy.idl             |    4 +-
 .../web-platform-tests/interfaces/fetch.idl   |   10 +-
 .../interfaces/filter-effects.idl             |    4 +-
 .../interfaces/fullscreen.idl                 |    8 +-
 .../interfaces/gamepad-extensions.idl         |    4 +-
 .../web-platform-tests/interfaces/gamepad.idl |    4 +-
 .../interfaces/generic-sensor.idl             |    8 +-
 .../interfaces/geolocation-API.idl            |   12 +-
 .../interfaces/geolocation-sensor.idl         |    4 +-
 .../interfaces/geometry.idl                   |    4 +-
 .../interfaces/get-installed-related-apps.idl |    4 +-
 .../interfaces/gyroscope.idl                  |    4 +-
 .../interfaces/hit-test.idl                   |    4 +-
 .../web-platform-tests/interfaces/hr-time.idl |    4 +-
 .../interfaces/html-media-capture.idl         |    4 +-
 .../web-platform-tests/interfaces/html.idl    |  466 +-
 .../idle-detection.tentative.idl}             |    0
 .../interfaces/image-capture.idl              |    4 +-
 .../interfaces/input-device-capabilities.idl  |    4 +-
 .../interfaces/input-events.idl               |    4 +-
 .../interfaces/intersection-observer.idl      |   12 +-
 .../interfaces/intervention-reporting.idl     |    4 +-
 .../interfaces/is-input-pending.idl           |    4 +-
 .../interfaces/js-self-profiling.idl          |    4 +-
 .../interfaces/keyboard-lock.idl              |    4 +-
 .../interfaces/keyboard-map.idl               |    4 +-
 .../interfaces/largest-contentful-paint.idl   |    4 +-
 .../interfaces/layout-instability.idl         |    4 +-
 .../interfaces/longtasks.idl                  |    4 +-
 .../interfaces/magnetometer.idl               |    4 +-
 .../interfaces/media-capabilities.idl         |    4 +-
 .../interfaces/media-playback-quality.idl     |    4 +-
 .../interfaces/media-source.idl               |    4 +-
 .../interfaces/mediacapture-depth.idl         |    4 +-
 .../interfaces/mediacapture-fromelement.idl   |    6 +-
 .../interfaces/mediacapture-streams.idl       |   18 +-
 .../interfaces/mediasession.idl               |    4 +-
 .../interfaces/mediastream-recording.idl      |    4 +-
 .../interfaces/mst-content-hint.idl           |    4 +-
 .../interfaces/native-file-system.idl         |   36 +-
 .../interfaces/navigation-timing.idl          |    4 +-
 .../web-platform-tests/interfaces/netinfo.idl |    4 +-
 .../interfaces/notifications.idl              |   10 +-
 .../interfaces/orientation-event.idl          |    4 +-
 .../interfaces/orientation-sensor.idl         |    6 +-
 .../interfaces/origin-policy.idl              |    4 +-
 .../interfaces/page-lifecycle.idl             |    4 +-
 .../interfaces/page-visibility.idl            |    4 +-
 .../interfaces/paint-timing.idl               |    4 +-
 .../interfaces/payment-handler.idl            |    4 +-
 .../interfaces/payment-method-basic-card.idl  |    4 +-
 .../interfaces/payment-request.idl            |   14 +-
 .../interfaces/performance-timeline.idl       |   10 +-
 .../interfaces/periodic-background-sync.idl   |    4 +-
 .../interfaces/permissions-request.idl        |    4 +-
 .../interfaces/permissions-revoke.idl         |    4 +-
 .../interfaces/permissions.idl                |    4 +-
 .../interfaces/picture-in-picture.idl         |    6 +-
 .../interfaces/pointerevents.idl              |    8 +-
 .../interfaces/pointerlock.idl                |    4 +-
 .../interfaces/presentation-api.idl           |    4 +-
 .../interfaces/proximity.idl                  |    4 +-
 .../interfaces/push-api.idl                   |    4 +-
 .../interfaces/referrer-policy.idl            |    4 +-
 .../interfaces/remote-playback.idl            |    4 +-
 .../interfaces/reporting.idl                  |   10 +-
 .../interfaces/requestidlecallback.idl        |    8 +-
 .../interfaces/resize-observer.idl            |   13 +-
 .../interfaces/resource-timing.idl            |    8 +-
 .../interfaces/sanitizer-api.tentative.idl    |   11 +
 .../interfaces/savedata.idl                   |    4 +-
 .../interfaces/screen-capture.idl             |    4 +-
 .../interfaces/screen-orientation.idl         |    4 +-
 .../interfaces/scroll-animations.idl          |    4 +-
 .../interfaces/scroll-to-text-fragment.idl    |   12 +
 .../interfaces/secure-contexts.idl            |    8 -
 .../interfaces/selection-api.idl              |   28 +-
 .../interfaces/server-timing.idl              |    4 +-
 .../interfaces/service-workers.idl            |    4 +-
 .../interfaces/shape-detection-api.idl        |    4 +-
 .../interfaces/speech-api.idl                 |   22 +-
 .../interfaces/storage-access.idl             |    6 +-
 .../web-platform-tests/interfaces/storage.idl |    4 +-
 .../web-platform-tests/interfaces/streams.idl |   70 +-
 .../interfaces/touch-events.idl               |    4 +-
 .../interfaces/ua-client-hints.idl            |    4 +-
 .../interfaces/uievents.idl                   |   10 +-
 .../wpt/web-platform-tests/interfaces/url.idl |   12 +-
 .../interfaces/user-timing.idl                |    8 +-
 .../interfaces/vibration.idl                  |    4 +-
 .../interfaces/video-rvfc.idl                 |    8 +-
 .../interfaces/visual-viewport.idl            |    4 +-
 .../interfaces/wai-aria.idl                   |    4 +-
 .../interfaces/wake-lock.idl                  |    7 +-
 .../interfaces/wasm-js-api.idl                |    6 +-
 .../interfaces/wasm-web-api.idl               |    4 +-
 .../interfaces/web-animations.idl             |   24 +-
 .../interfaces/web-bluetooth.idl              |    4 +-
 .../interfaces/web-locks.idl                  |    4 +-
 .../web-platform-tests/interfaces/web-nfc.idl |    8 +-
 .../web-platform-tests/interfaces/web-otp.idl |    4 +-
 .../interfaces/web-share.idl                  |    6 +-
 .../interfaces/webaudio.idl                   |   94 +-
 .../interfaces/webauthn.idl                   |    6 +-
 .../interfaces/webdriver.idl                  |    4 +-
 .../web-platform-tests/interfaces/webgl1.idl  |    4 +-
 .../web-platform-tests/interfaces/webgl2.idl  |    4 +-
 .../web-platform-tests/interfaces/webhid.idl  |    4 +-
 .../web-platform-tests/interfaces/webmidi.idl |    4 +-
 .../interfaces/webrtc-identity.idl            |    8 +-
 .../interfaces/webrtc-stats.idl               |    6 +-
 .../interfaces/webrtc-svc.idl                 |    4 +-
 .../web-platform-tests/interfaces/webrtc.idl  |   54 +-
 .../web-platform-tests/interfaces/webusb.idl  |   20 +-
 .../web-platform-tests/interfaces/webvtt.idl  |    4 +-
 .../interfaces/webxr-ar-module.idl            |    4 +-
 .../interfaces/webxr-gamepads-module.idl      |    4 +-
 .../interfaces/webxr-hand-input.idl           |   58 +
 .../web-platform-tests/interfaces/webxr.idl   |   14 +-
 .../interfaces/worklets.idl                   |    6 +-
 .../wpt/web-platform-tests/interfaces/xhr.idl |   26 +-
 .../observer-attributes.html                  |    9 +
 .../is-input-pending/README.md                |    3 +
 .../is-input-pending/resources/blank.html     |    2 +
 .../resources/input-onmessage.js              |   25 +
 .../resources/pending-input-utils.js          |   68 +
 ...ross-origin-subframe-complex-clip.sub.html |   27 +
 ...igin-subframe-masked-complex-clip.sub.html |   34 +
 ...ame-masked-pointer-events-mixed-2.sub.html |   45 +
 ...frame-masked-pointer-events-mixed.sub.html |   43 +
 ...bframe-masked-pointer-events-none.sub.html |   33 +
 .../cross-origin-subframe-overlap.sub.html    |   28 +
 ...igin-subframe-pointer-events-none.sub.html |   26 +
 ...cross-origin-subframe-transformed.sub.html |   27 +
 .../security/cross-origin-subframe.sub.html   |   21 +
 .../tentative/same-origin-subframe.sub.html   |   32 +
 .../is-input-pending/tentative/toplevel.html  |   26 +
 ...p-prevented-with-reference.optional.any.js |   50 +
 ...-prevented-with-unregister.optional.any.js |   57 +
 ...ce-to-call-cleanupCallback.optional.any.js |  100 +
 .../holdings-multiple-values.optional.any.js  |   65 +
 .../weakrefs/reentrancy.optional.any.js       |   50 +
 .../resources/maybe-garbage-collect.js        |   96 +
 .../return-undefined-with-gc.optional.any.js  |   78 +
 ...unregister-cleaned-up-cell.optional.any.js |   72 +
 .../inline-flow-shift-one-line.html           |   41 +
 .../inline-flow-shift-vertical-rl.html        |    4 +-
 tests/wpt/web-platform-tests/lint.ignore      |   13 +-
 .../mpadded/mpadded-003.html                  |   26 +-
 ...o-not-in-dictionary-lspace-rspace-ref.html |   47 +
 .../mo-not-in-dictionary-lspace-rspace.html   |   52 +
 ...o-not-in-dictionary-movablelimits-ref.html |   47 +
 .../mo-not-in-dictionary-movablelimits.html   |   52 +
 .../scripts/underover-parameters-3.html       |  118 +
 ... => underover-parameters-4.tentative.html} |    3 +-
 .../css-styling/multi-column-layout.html      |   56 +
 .../html5-tree/content-editable.html          |   51 +
 .../html5-tree/integration-point-5.html       |   57 +
 .../math-global-event-handlers.tentative.html |    4 +-
 .../resources/imagecapture-helpers.js         |   52 +-
 .../MediaStreamTrack-getSettings.https.html   |    3 +-
 .../idlharness.https.any.js                   |    2 +-
 .../opaque-origin.https.window.js             |    8 +-
 .../resources/message-target.js               |    6 +-
 .../resources/opaque-origin-sandbox.html      |   10 +-
 .../resources/sandboxed-fs-test-helpers.js    |    6 +-
 .../showOpenFilePicker-manual.https.html      |    4 +-
 .../showPicker-errors.https.window.js         |   26 +-
 .../showSaveFilePicker-manual.https.html      |    2 +-
 .../close_async.tentative.https.any.js        |   15 +
 .../close_sync.tentative.https.any.js         |    7 +
 ..._io_setLength_async.tentative.https.any.js |   31 +
 .../concurrent_io/operation_helpers.js        |   13 +
 ...tLength_async_basic.tentative.https.any.js |   53 +
 ...etLength_sync_basic.tentative.https.any.js |   48 +
 ...Length_bounds_async.tentative.https.any.js |   20 +
 ...tLength_bounds_sync.tentative.https.any.js |   24 +
 ...orthy_origin_failure.tentative.http.any.js |    9 +
 .../navigation-timing/idlharness.window.js    |   33 +-
 .../nav2_test_navigate_iframe.html            |    4 +-
 .../test_document_onload.html                 |    6 +-
 .../resources/orientation-event-helpers.js    |   47 +-
 ...rent-no-child-bad-subdomain.sub.https.html |    4 +-
 .../parent-no-child-yes-port.sub.https.html   |    7 +-
 .../parent-no-child-yes-same.sub.https.html   |    7 +-
 ...rent-no-child-yes-subdomain.sub.https.html |    7 +-
 ...ild-yeswithparams-subdomain.sub.https.html |    7 +-
 .../parent-yes-child-no-port.sub.https.html   |    6 +-
 .../parent-yes-child-no-same.sub.https.html   |    6 +-
 ...rent-yes-child-no-subdomain.sub.https.html |    6 +-
 .../parent-yes-child-yes-port.sub.https.html  |    6 +-
 .../parent-yes-child-yes-same.sub.https.html  |    6 +-
 ...ent-yes-child-yes-subdomain.sub.https.html |    6 +-
 ...domain-child2-yes-subdomain.sub.https.html |    8 +-
 ...in-child2-yes-subdomainport.sub.https.html |    5 +
 ...main1-child2-yes-subdomain2.sub.https.html |    9 +-
 ...es-subdomain-child2-no-port.sub.https.html |    8 +-
 ...bdomain-child2-no-subdomain.sub.https.html |    8 +-
 ...bdomain-child2-no-subdomain.sub.https.html |    8 +-
 ...domain-child2-no-subdomain2.sub.https.html |    8 +-
 ...domain-child2-yes-subdomain.sub.https.html |    8 +-
 ...omain-child2-yes-subdomain2.sub.https.html |    8 +-
 ...in-child2-yes-subdomainport.sub.https.html |    5 +
 ...es-subdomain-child2-no-port.sub.https.html |    8 +-
 ...bdomain-child2-no-subdomain.sub.https.html |    8 +-
 ...domain-child2-yes-subdomain.sub.https.html |    8 +-
 ...omain-child2-yes-subdomain2.sub.https.html |    8 +-
 ...in-child2-yes-subdomainport.sub.https.html |    5 +
 .../origin-isolation/README.md                |    5 +
 .../about-blank.https.sub.html                |   10 +-
 .../csp-sandbox-no.https.html                 |   15 +
 .../csp-sandbox-no.https.html.headers         |    1 +
 .../csp-sandbox-yes.https.html                |   15 +
 .../csp-sandbox-yes.https.html.headers        |    2 +
 .../data-to-javascript-no.https.html          |   12 +
 .../data-to-javascript-yes.https.html         |   12 +
 ...data-to-javascript-yes.https.html.headers} |    0
 .../data-url-no.https.html                    |   12 +
 .../data-url-yes.https.html                   |   12 +
 ...eaders => data-url-yes.https.html.headers} |    0
 .../getter-special-cases/data-url.https.html  |   40 -
 .../javascript-url-no.https.html              |   12 +
 .../javascript-url-yes.https.html             |   12 +
 .../javascript-url-yes.https.html.headers     |    1 +
 .../removed-iframe.sub.https.html             |   12 +-
 .../resources/data-to-javascript-test.mjs     |   33 +
 .../resources/data-url-test.mjs               |   13 +
 .../resources/helpers.mjs                     |   29 +
 .../resources/javascript-url-test.mjs         |   14 +
 .../resources/sandboxed-iframe-test.sub.mjs   |   20 +
 .../sandboxed-same-origin-iframe-test.sub.mjs |   20 +
 .../sandboxed-iframe-no.https.html            |   12 +
 .../sandboxed-iframe-yes.https.html           |   12 +
 .../sandboxed-iframe-yes.https.html.headers   |    1 +
 .../sandboxed-iframe.sub.https.html           |   32 -
 ...sandboxed-same-origin-iframe-no.https.html |   12 +
 ...andboxed-same-origin-iframe-yes.https.html |   12 +
 ...-same-origin-iframe-yes.https.html.headers |    1 +
 ...ent-no-1-no-same-2-yes-port.sub.https.html |   10 +-
 ...o-1-no-same-2-yes-subdomain.sub.https.html |   10 +-
 ...o-subdomain-2-yes-subdomain.sub.https.html |   10 +-
 ...-subdomain-2-yes-subdomain2.sub.https.html |   10 +-
 ...bdomain-yes-2-subdomain2-no.sub.https.html |   10 +-
 ...es-subdomain-2-no-subdomain.sub.https.html |   10 +-
 ...ent-yes-1-no-same-2-no-port.sub.https.html |   10 +-
 ...es-1-no-same-2-no-subdomain.sub.https.html |   10 +-
 .../origin-isolation/insecure-http.sub.html   |    6 +-
 .../opener-no-openee-yes-port.sub.https.html  |   28 +
 .../opener-no-openee-yes-same.sub.https.html  |   27 +
 ...ner-no-openee-yes-subdomain.sub.https.html |   28 +
 .../opener-yes-openee-no-port.sub.https.html  |   28 +
 ...-yes-openee-no-port.sub.https.html.headers |    1 +
 .../opener-yes-openee-no-same.sub.https.html  |   27 +
 ...-yes-openee-no-same.sub.https.html.headers |    1 +
 ...ner-yes-openee-no-subdomain.sub.https.html |   28 +
 ...openee-no-subdomain.sub.https.html.headers |    1 +
 .../opener-yes-openee-yes-port.sub.https.html |   28 +
 ...yes-openee-yes-port.sub.https.html.headers |    1 +
 .../opener-yes-openee-yes-same.sub.https.html |   27 +
 ...yes-openee-yes-same.sub.https.html.headers |    1 +
 ...er-yes-openee-yes-subdomain.sub.https.html |   28 +
 ...penee-yes-subdomain.sub.https.html.headers |    1 +
 .../removing-iframes.sub.https.html           |   10 +-
 .../origin-isolation/resources/helpers.mjs    |  119 +-
 ...script.mjs => send-header-page-script.mjs} |   22 +-
 ...rs => send-header-page-script.mjs.headers} |    0
 .../resources/send-origin-isolation-header.py |    2 +-
 .../child-painting-first-image.html           |   24 +-
 .../fcp-only/fcp-background-size.html         |   12 +-
 .../fcp-only/fcp-bg-image-set.html            |   12 +-
 .../fcp-only/fcp-bg-image-two-steps.html      |   12 +-
 .../paint-timing/fcp-only/fcp-iframe.html     |   27 +
 .../fcp-only/fcp-invisible-scale.html         |   12 +-
 .../paint-timing/fcp-only/fcp-opacity.html    |   12 +-
 .../fcp-only/fcp-out-of-bounds.html           |   12 +-
 .../fcp-only/fcp-pseudo-element-image.html    |   12 +-
 .../paint-timing/fcp-only/fcp-whitespace.html |   12 +-
 .../resources/subframe-painting.html          |   26 +-
 .../paint-timing/resources/utils.js           |    5 +-
 .../sibling-painting-first-image.html         |   28 +-
 .../secure-payment-confirmation.https.html    |  170 +-
 .../case-sensitivity.any.js                   |   35 +
 ...terevent_mouse-pointer-preventdefault.html |  189 +-
 ...use_pointercapture_inactivate_pointer.html |   82 +
 ...erevent_touch-adjustment_click_target.html |   67 +
 ...e_on_chorded_mouse_button_when_locked.html |   48 +-
 ...ntercapture_inactivate_pointer-iframe.html |    3 +
 .../portals/portals-host-exposure.sub.html    |   34 +-
 .../portals-host-post-message.sub.html        |   98 +-
 .../portals/portals-post-message.sub.html     |   54 +-
 ...portal-host-cross-origin-navigate.sub.html |    4 +-
 .../portal-host-post-message-x-origin.html    |    4 +
 ...sub.html => portal-host-post-message.html} |    0
 .../portals/resources/portal-host.html        |    8 +-
 .../portal-post-message-x-origin-portal.html  |   11 +
 .../portals/resources/stash-utils.sub.js      |   43 +
 ...id-delaying-onload-link-preload-style.html |   15 +
 .../avoid-delaying-onload-link-preload.html   |    2 +-
 .../web-platform-tests/raw-sockets/META.yml   |    5 +
 .../web-platform-tests/raw-sockets/README.md  |    2 +
 .../open-consume-activation.https.html        |   58 +
 .../raw-sockets/open-securecontext.http.html  |   21 +
 .../open-without-user-gesture.https.html      |   26 +
 .../remotePort-required.https.html            |   67 +
 ...resource_nested_dedicated_worker.worker.js |    4 +-
 .../resources/chromium/README.md              |    9 +-
 .../chromium/image_capture-mojom.js.headers   |    1 -
 .../resources/chromium/image_capture.mojom.js | 1403 ---
 .../chromium/mock-idle-detection.js}          |    0
 .../resources/chromium/mojo_bindings.js       | 5146 ----------
 .../chromium/mojo_bindings.js.headers         |    1 -
 .../mojo_web_test_helper_test.mojom.js        |  264 -
 ...mojo_web_test_helper_test.mojom.js.headers |    1 -
 .../resources/chromium/nfc-mock.js            |   11 +-
 .../resources/chromium/sensor.mojom.js        | 1074 ---
 .../chromium/sensor_provider.mojom.js         |  429 -
 .../resources/test-only-api.js                |   34 +-
 .../resources/testharness.js                  |    4 +-
 .../web-platform-tests/sanitizer-api/META.yml |    5 +
 .../idlharness.tentative.window.js            |   12 +
 .../sanitizer-config.tentative.html           |   59 +
 .../sanitizer-sanitize.tentative.html         |   25 +
 .../sanitizer-sanitizeToString.tentative.html |   18 +
 .../sanitizer-api/support/testcases.sub.js    |   17 +
 ...wakelock-document-hidden-manual.https.html |    2 +
 .../wakelock-released.https.html              |   38 +
 .../getScreens.values.https.html              |    4 +-
 .../isMultiScreen.values.https.html           |    4 +-
 .../resources/screenenumeration-helpers.js    |   63 +-
 .../scroll-animations/constructor.html        |   61 +-
 .../constructor.tentative.html                |   41 +-
 .../css/animation-shorthand.html              |   53 +
 .../css/animation-timeline-in-keyframe.html   |    5 +-
 .../css/animation-timeline-none.html          |   46 +
 .../at-scroll-timeline-element-offsets.html   |  241 +
 .../css/at-scroll-timeline-orientation.html   |    4 +-
 .../css/at-scroll-timeline-source.html        |    4 +-
 .../css/at-scroll-timeline-start-end.html     |    4 +-
 .../css/at-scroll-timeline-time-range.html    |    4 +-
 .../css/scroll-timeline-cssom.tentative.html  |   14 +-
 .../current-time-writing-modes.html           |   18 +-
 .../scroll-animations/current-time.html       |  113 +-
 ...-changes-on-percentage-based-timeline.html |    4 +-
 ...oll-animation-effect-phases.tentative.html |   42 +-
 .../scroll-timeline-phases.tentative.html     |    6 +-
 .../setting-timeline.tentative.html           |  320 +
 .../client-redirect.html                      |   12 +
 .../idlharness.window.js                      |   15 +
 .../redirects-target.html                     |   42 +
 .../redirects-target2.html                    |   28 +
 .../scroll-to-text-fragment/redirects.html    |  126 +
 .../scroll-to-text-fragment-api.html          |   14 +-
 .../secure-contexts/idlharness.any.js         |   20 -
 .../selection/contenteditable/collapse.html   |   43 +
 .../contenteditable/modify.tentative.html     |   16 +
 .../cache-storage/script-tests/cache-add.js   |   18 +
 .../cache-storage/script-tests/cache-put.js   |   19 +
 .../cache-storage/window/cache-add.https.html |    1 +
 .../cache-storage/window/cache-put.https.html |    1 +
 .../fetch-request-resources.https.html        |    2 +-
 .../resources/test-helpers.sub.js             |   60 +-
 .../detection-on-worker.https.worker.js       |    1 +
 .../resources/shapedetection-helpers.js       |   59 +-
 ...ge-in-detached-iframe.tentative.https.html |   21 +
 .../transferable/deserialize-error.window.js  |   39 +
 .../resources/create-wasm-module.js           |   11 +
 .../resources/deserialize-error-frame.html    |   39 +
 .../tools/certs/config.json                   |    2 +-
 .../ci/azure/safari-technology-preview.rb     |   42 +-
 .../web-platform-tests/tools/ci/commands.json |    7 +
 .../tools/ci/regen_certs.py                   |   99 +
 .../tools/ci/tc/github_checks_output.py       |   23 +-
 .../tools/ci/tc/tasks/test.yml                |    5 +-
 .../wpt/web-platform-tests/tools/lint/lint.py |   67 +-
 .../tools/lint/tests/test_lint.py             |    5 +-
 .../web-platform-tests/tools/serve/serve.py   |    3 +-
 .../tools/third_party/pywebsocket3/.gitignore |    4 +
 .../tools/third_party/pywebsocket3/README.md  |    2 +-
 .../pywebsocket3/example/echo_client.py       |  143 +-
 .../mod_pywebsocket/extensions.py             |    1 +
 .../mod_pywebsocket/http_header_util.py       |    2 +-
 .../mod_pywebsocket/request_handler.py        |    2 +-
 .../mod_pywebsocket/standalone.py             |  357 +-
 .../pywebsocket3/test/client_for_testing.py   |    7 +
 .../third_party/pywebsocket3/test/run_all.py  |   13 +-
 .../pywebsocket3/test/set_sys_path.py         |    2 +-
 .../pywebsocket3/test/test_dispatch.py        |    4 +-
 .../pywebsocket3/test/test_endtoend.py        |   93 +-
 .../pywebsocket3/test/test_msgutil.py         |    4 -
 .../pywebsocket3/test/test_util.py            |    5 +-
 .../tools/wave/www/css/bulma-0.7.5/bulma.css  |    2 +-
 .../tools/webdriver/webdriver/client.py       |    3 +
 .../web-platform-tests/tools/wpt/browser.py   |    5 +-
 .../wptrunner/wptrunner/browsers/chrome.py    |    9 +-
 .../wptrunner/browsers/chrome_spki_certs.py   |   13 +
 .../wptrunner/wptrunner/browsers/firefox.py   |   15 +-
 .../wptrunner/executors/executormarionette.py |   25 +-
 .../tools/wptrunner/wptrunner/stability.py    |    4 +-
 .../tools/wptrunner/wptrunner/testloader.py   |    4 +
 .../tools/wptrunner/wptrunner/testrunner.py   |    8 +-
 .../wptrunner/tests/test_testloader.py        |   43 +-
 .../tools/wptrunner/wptrunner/vcs.py          |    8 +-
 .../wptrunner/wptrunner/wptcommandline.py     |    4 +-
 .../tools/wptrunner/wptrunner/wptrunner.py    |    3 +
 .../tools/wptrunner/wptrunner/wpttest.py      |    2 +-
 .../tools/wptserve/docs/index.rst             |   12 +-
 .../wptserve/tests/functional/test_pipes.py   |    8 +
 .../tools/wptserve/wptserve/handlers.py       |    2 +-
 .../url/resources/setters_tests.json          |   55 +
 .../url/resources/urltestdata.json            |  184 +
 .../wasm/jsapi/idlharness.any.js              |   37 +-
 .../memory/constructor-types.tentative.any.js |   20 +
 .../wasm/jsapi/memory/constructor.any.js      |   11 +-
 .../wasm/jsapi/table/assertions.js            |   11 +
 .../table/constructor-types.tentative.any.js  |   20 +
 .../wasm/jsapi/table/constructor.any.js       |   12 +-
 .../web-animations/testcommon.js              |   11 +-
 .../setting-the-timeline-of-an-animation.html |   16 +-
 .../resources/dynamic/__dir__.headers         |    1 +
 .../resources/dynamic/classic_script.js       |    1 +
 .../resources/dynamic1/classic_script.js      |    1 +
 .../resources/dynamic2/classic_script.js      |    1 +
 .../resources/generate-test-wbns.sh           |   11 +-
 .../resources/wbn/dynamic1-crossorigin.wbn    |  Bin 0 -> 1487 bytes
 .../web-bundle/resources/wbn/dynamic1.wbn     |  Bin 1201 -> 1481 bytes
 .../web-bundle/resources/wbn/dynamic2.wbn     |  Bin 1201 -> 1481 bytes
 .../web-bundle/resources/wbn/subresource.wbn  |  Bin 523 -> 517 bytes
 ...rce-loading-from-web-bundle.tentative.html |   57 +-
 .../web-nfc/NDEFWriter_write.https.html       |   54 +-
 .../web-nfc/resources/nfc-helpers.js          |   55 +-
 .../disabled-by-feature-policy.https.sub.html |    1 +
 .../web-share/feature-policy-listed.html      |   31 +
 .../share-consume-activation.https.html       |    2 +-
 .../web-share/share-empty.https.html          |    2 +-
 .../web-share/share-securecontext.http.html   |    1 +
 .../web-share/share-url-invalid.https.html    |   61 +-
 ...udioworkletnode-with-parameters.https.html |   16 +
 .../the-delaynode-interface/delay-test.html   |   61 +
 .../detune-overflow.html                      |   41 +
 .../webcodecs/audio-decoder.html              |   65 +
 .../wpt/web-platform-tests/webcodecs/h264.mp4 |  Bin 0 -> 7637 bytes
 .../wpt/web-platform-tests/webcodecs/utils.js |  126 +
 .../webcodecs/video-decoder.html              |  191 +
 .../webcodecs/video-encoder.html              |  222 +-
 .../webcodecs/video-frame-serialization.html  |  123 +
 .../webcodecs/video-frame.html                |  108 +
 .../wpt/web-platform-tests/webcodecs/vp9.mp4  |  Bin 0 -> 6159 bytes
 .../webdriver/tests/execute_script/execute.py |   19 +
 .../webdriver/tests/get_current_url/get.py    |   42 +-
 .../webdriver/tests/get_current_url/iframe.py |   65 +
 .../webdriver/tests/get_title/get.py          |   53 +-
 .../webdriver/tests/get_title/iframe.py       |   70 +
 .../webdriver/tests/new_window/new_tab.py     |   24 +-
 .../webdriver/tests/new_window/new_window.py  |   24 +-
 .../tests/perform_actions/conftest.py         |   17 +
 .../tests/perform_actions/pointer.py          |   10 +-
 .../perform_actions/pointer_tripleclick.py    |    2 +-
 .../webdriver/tests/print/printcmd.py         |    8 +-
 .../webdriver/tests/print/user_prompts.py     |    4 +-
 ...udioFrame-serviceworker-failure.https.html |    8 +-
 ...ideoFrame-serviceworker-failure.https.html |    8 +-
 ...ection-insertable-streams-audio.https.html |  291 +
 ...on-insertable-streams-simulcast.https.html |   85 +
 ...erConnection-insertable-streams.https.html |  417 +
 .../RTCPeerConnection-insertable-streams.js   |  241 +
 ...erConnection-sender-worker-single-frame.js |   19 +
 .../webrtc/RTCIceCandidate-constructor.html   |    2 +-
 ...PeerConnection-candidate-in-sdp.https.html |   26 +
 ...n-description-attributes-timing.https.html |   81 +
 .../webrtc/RTCPeerConnection-helper.js        |   54 +-
 .../RTCPeerConnection-iceGatheringState.html  |   10 +-
 ...erConnection-mandatory-getStats.https.html |   64 +-
 ...nection-onsignalingstatechanged.https.html |   15 +
 ...erConnection-perfect-negotiation-helper.js |  151 +
 ...negotiation-stress-glare-linear.https.html |   23 +
 ...erfect-negotiation-stress-glare.https.html |   23 +
 ...rConnection-perfect-negotiation.https.html |  166 +-
 .../RTCPeerConnection-videoDetectorTest.html  |   38 +-
 ...RTCRtpTransceiver-setCodecPreferences.html |  171 +-
 .../webrtc/RTCRtpTransceiver.https.html       |    7 +-
 .../handlers/stash_responder_blocking_wsh.py  |   45 +
 .../web-platform-tests/webstorage/README.md   |    2 +
 .../webstorage/idlharness.window.js           |   29 -
 .../webstorage/set.window.js                  |    6 +-
 .../webusb/resources/usb-helpers.js           |    4 +-
 .../hand-input/idlharness.https.window.js     |   16 +
 .../webxr/resources/webxr_util.js             |   22 +-
 .../workers/Worker_script_mimetype.htm        |   41 +-
 .../onerror/exception-in-onerror.html         |   10 +-
 .../onerror/exception-in-onerror.js           |   25 -
 .../onerror/message-classic-DOMException.html |    7 +
 .../onerror/message-classic-Error.html        |    7 +
 .../onerror/message-helper.js                 |   61 +
 .../onerror/message-module-DOMException.html  |    7 +
 .../onerror/message-module-Error.html         |    7 +
 .../WorkerGlobalScope/onerror/throw.js        |   34 +
 .../x-frame-options/META.yml                  |    3 +-
 .../x-frame-options/README.md                 |    5 +-
 .../x-frame-options/deny.html                 |   43 +
 .../x-frame-options/deny.sub.html             |   61 -
 .../x-frame-options/get-decode-split.html     |   23 +
 .../x-frame-options/invalid.html              |   59 +
 .../x-frame-options/invalid.sub.html          |   84 -
 .../x-frame-options/multiple.html             |  124 +
 .../x-frame-options/multiple.sub.html         |   87 -
 .../x-frame-options/redirect.html             |   17 +
 .../x-frame-options/redirect.sub.html         |   19 -
 .../x-frame-options/sameorigin.sub.html       |  113 +-
 .../x-frame-options/support/helper.js         |   13 -
 .../x-frame-options/support/helper.sub.js     |  104 +
 1377 files changed, 31062 insertions(+), 16983 deletions(-)
 create mode 100644 tests/wpt/metadata-layout-2020/FileAPI/file/File-constructor.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-position.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/animations/tab-size-interpolation.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-integer-004.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-002.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-003.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom/CSSCounterStyleRule.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/custom-elements/CustomElementRegistry.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/fetch/api/request/request-structure.html.ini
 rename tests/wpt/{metadata/fetch/metadata/embed.https.sub.html.ini => metadata-layout-2020/fetch/metadata/embed.https.sub.tentative.html.ini} (91%)
 create mode 100644 tests/wpt/metadata-layout-2020/fetch/stale-while-revalidate/stale-image.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/fullscreen/api/document-fullscreen-enabled.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
 rename tests/wpt/{metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini => metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini} (71%)
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/dom/elements/images/bypass-cache-revalidation.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/reentrancy.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/selection/contenteditable/collapse.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/selection/contenteditable/modify.tentative.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/wasm/jsapi/memory/constructor.any.js.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/execute.py.ini
 create mode 100644 tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/Worker_script_mimetype.htm.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
 create mode 100644 tests/wpt/metadata/FileAPI/file/File-constructor.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
 create mode 100644 tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini
 create mode 100644 tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/canvas-dynamic-change-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
 create mode 100644 tests/wpt/metadata/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-position.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/animations/tab-size-interpolation.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/tab-size/tab-size-integer-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ogham-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ogham-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ogham-003.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-ui/appearance-button-002.tentative.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-ui/webkit-appearance-button-002.tentative.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom/CSSCounterStyleRule.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini
 create mode 100644 tests/wpt/metadata/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini
 create mode 100644 tests/wpt/metadata/fetch/metadata/embed.https.sub.tentative.html.ini
 create mode 100644 tests/wpt/metadata/fullscreen/api/document-fullscreen-enabled.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
 rename tests/wpt/{metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini => metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini} (71%)
 create mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
 delete mode 100644 tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html.ini
 create mode 100644 tests/wpt/metadata/html/dom/elements/images/bypass-cache-revalidation.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini
 create mode 100644 tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/reentrancy.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini
 create mode 100644 tests/wpt/metadata/selection/contenteditable/collapse.html.ini
 create mode 100644 tests/wpt/metadata/selection/contenteditable/modify.tentative.html.ini
 create mode 100644 tests/wpt/metadata/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini
 create mode 100644 tests/wpt/metadata/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini
 delete mode 100644 tests/wpt/metadata/webstorage/idlharness.window.js.ini
 create mode 100644 tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini
 delete mode 100644 tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
 create mode 100644 tests/wpt/metadata/workers/Worker_script_mimetype.htm.ini
 delete mode 100644 tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini
 create mode 100644 tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
 create mode 100644 tests/wpt/web-platform-tests/.github/workflows/regen_certs.yml
 create mode 100644 tests/wpt/web-platform-tests/WebIDL/idlharness.any.js
 delete mode 100644 tests/wpt/web-platform-tests/WebIDL/idlharness.html
 create mode 100644 tests/wpt/web-platform-tests/clipboard-apis/async-svg-script-removal.https.html
 create mode 100644 tests/wpt/web-platform-tests/clipboard-apis/async-write-svg-read-svg.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-a.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-b.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-c.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-d.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-e.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/inline-background-rtl-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond-27x27.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/support/new-red-diamond-27x27.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-000-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-000.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-002-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-003-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-004-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-005-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-006-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-007-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/borders-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/fieldset-002-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/fieldset-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/fieldset-003-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/fieldset-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/fieldset-004-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/fieldset-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-cascade/import-conditional-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-cascade/important-transition-manual.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-cascade/support/test-green.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-cascade/support/test-red.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/resources/markA.ttf
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/resources/markB.ttf
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-position.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-000-crash.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-001-crash.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-002-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-003-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-004-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-005-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/clip-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-001.tentative.html
 rename tests/wpt/web-platform-tests/css/css-pseudo/{file-chooser-button-001-notref.html => file-selector-button-001-notref.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.tentative.html
 rename tests/wpt/web-platform-tests/css/css-pseudo/{file-chooser-button-display-toggle-crash.tentative.html => file-selector-button-display-toggle-crash.tentative.html} (70%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-overflow-wrap.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-dynamic-crash.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted}/float-retry-push-circle.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted}/float-retry-push-image.html (97%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted}/float-retry-push-inset.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted}/float-retry-push-polygon.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted}/float-should-push.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted/reference}/float-retry-push-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/assorted/reference}/float-should-push-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-005-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-006-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-007-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-008-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-009-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-010-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-011-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-border-box-border-radius-012-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-content-box-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-content-box-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-content-box-border-radius-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-content-box-border-radius-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-003-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-004-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-005-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-006-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-007-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-margin-box-border-radius-008-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-padding-box-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-padding-box-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-padding-box-border-radius-001-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box/reference}/shape-outside-padding-box-border-radius-002-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-001.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-002.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-001.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-002.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-003.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-004.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-005.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-006.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-007.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-008.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-009.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-010.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-011.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-border-box-border-radius-012.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-content-box-001.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-content-box-002.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-content-box-border-radius-001.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-content-box-border-radius-002.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-001.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-002.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-001.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-002.html (93%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-003.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-004.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-005.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-006.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-007.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-margin-box-border-radius-008.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-padding-box-001.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-padding-box-002.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-padding-box-border-radius-001.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/shape-box}/shape-outside-padding-box-border-radius-002.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-032-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-033-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-034-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-035-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-036-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-041-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-042-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-047-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-048-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-049-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-050-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-051-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-052-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-053-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-054-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-055-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle/reference}/shape-outside-circle-056-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-032.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-033.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-034.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-035.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-036.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-037.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-038.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-041.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-042.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-043.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-044.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-047.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-048.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-049.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-050.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-051.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-052.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-053.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-054.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-055.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/circle}/shape-outside-circle-056.html (97%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-032-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-033-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-034-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-035-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-036-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-037-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-038-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-039-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-040-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-042-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-044-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-045-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-046-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-047-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-048-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-049-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-050-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-051-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse/reference}/shape-outside-ellipse-052-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-032.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-033.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-034.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-035.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-036.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-037.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-038.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-039.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-040.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-041.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-042.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-043.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-044.html (94%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-045.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-046.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-047.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-048.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-049.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-050.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-051.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/ellipse}/shape-outside-ellipse-052.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-016-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-017-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-020-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-021-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-022-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-023-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-024-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-025-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-026-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset/reference}/shape-outside-inset-027-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-016.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-017.html (95%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-020.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-021.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-022.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-023.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-024.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-025.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-026.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/inset}/shape-outside-inset-027.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-018-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-019-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-020-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-021-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-022-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-023-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-024-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-025-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon/reference}/shape-outside-polygon-032-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-018.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-019.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-020.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-021.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-022.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-023.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-024.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-025.html (96%)
 rename tests/wpt/web-platform-tests/css/{vendor-imports/mozilla/mozilla-central-reftests/shapes1 => css-shapes/shape-outside/supported-shapes/polygon}/shape-outside-polygon-032.html (97%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-015.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-016.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-017.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-018.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-019.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-020.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-021.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers
 create mode 100644 tests/wpt/web-platform-tests/css/css-tables/absolute-tables-008.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-tables/absolute-tables-009.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-tables/absolute-tables-010.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-tables/absolute-tables-011.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-tables/absolute-tables-012.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/animations/tab-size-interpolation.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-004.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-ui/appearance-button-001-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-002.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-002.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom-view/client-props-root-display-none-crash.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom/CSSCounterStyleRule.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom/CSSFontFaceRule.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom/removerule-invalidation-crash.html
 create mode 100644 tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-foreignObject.html
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
 delete mode 100644 tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/support/Ahem.ttf
 create mode 100644 tests/wpt/web-platform-tests/docs/admin/pywebsocket3.rst
 rename tests/wpt/web-platform-tests/{feature-policy => document-policy}/experimental-features/document-write.tentative.html (89%)
 rename tests/wpt/web-platform-tests/{feature-policy => document-policy}/experimental-features/resources/async-script.js (100%)
 rename tests/wpt/web-platform-tests/{feature-policy => document-policy}/experimental-features/resources/defer-script.js (100%)
 rename tests/wpt/web-platform-tests/{feature-policy/experimental-features/resources/document-write.html => document-policy/experimental-features/resources/document-write-allowed.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html
 create mode 100644 tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers
 rename tests/wpt/web-platform-tests/{feature-policy => document-policy}/experimental-features/resources/parser-blocking-script.js (100%)
 rename tests/wpt/web-platform-tests/{feature-policy => document-policy}/experimental-features/resources/sync-script-test.js (100%)
 rename tests/wpt/web-platform-tests/{feature-policy => document-policy}/experimental-features/sync-script.tentative.https.sub.html (65%)
 create mode 100644 tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers
 rename tests/wpt/web-platform-tests/{feature-policy/reporting/document-write-report-only.html => document-policy/reporting/document-write-report-only-tentative.html} (83%)
 create mode 100644 tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html.headers
 rename tests/wpt/web-platform-tests/{feature-policy/reporting/document-write-reporting.html => document-policy/reporting/document-write-reporting-tentative.html} (87%)
 create mode 100644 tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html.headers
 rename tests/wpt/web-platform-tests/document-policy/reporting/{unoptimized-lossy-images-reporting-onload.html => lossy-images-max-bpp-reporting-onload-tentative.html} (91%)
 create mode 100644 tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers
 rename tests/wpt/web-platform-tests/document-policy/reporting/{unoptimized-lossy-images-reporting.html => lossy-images-max-bpp-reporting-tentative.html} (92%)
 create mode 100644 tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers
 rename tests/wpt/web-platform-tests/document-policy/reporting/{oversized-images-reporting.html => oversized-images-reporting-tentative.html} (100%)
 rename tests/wpt/web-platform-tests/document-policy/reporting/{oversized-images-reporting.html.headers => oversized-images-reporting-tentative.html.headers} (100%)
 delete mode 100644 tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers
 rename tests/wpt/web-platform-tests/document-policy/reporting/{unsized-media-reporting.html => unsized-media-reporting-tentative.html} (100%)
 rename tests/wpt/web-platform-tests/document-policy/reporting/{unsized-media-reporting.html.headers => unsized-media-reporting-tentative.html.headers} (100%)
 create mode 100644 tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/editing/other/recursive-exec-command-calls.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/entries-api/idlharness-manual.html
 create mode 100644 tests/wpt/web-platform-tests/entries-api/idlharness-manual.window.js
 delete mode 100644 tests/wpt/web-platform-tests/entries-api/idlharness.html
 create mode 100644 tests/wpt/web-platform-tests/entries-api/idlharness.window.js
 delete mode 100644 tests/wpt/web-platform-tests/eventsource/idlharness.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html.headers
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/basic/request-headers-nonascii.any.js
 create mode 100644 tests/wpt/web-platform-tests/fetch/api/response/response-body-read-task-handling.html
 create mode 100644 tests/wpt/web-platform-tests/fetch/http-cache/cache-mode.html
 rename tests/wpt/web-platform-tests/fetch/metadata/{embed.https.sub.html => embed.https.sub.tentative.html} (92%)
 create mode 100644 tests/wpt/web-platform-tests/font-access/README.md
 create mode 100644 tests/wpt/web-platform-tests/font-access/font_access-blob.tentative.https.window.js
 create mode 100644 tests/wpt/web-platform-tests/font-access/font_access-enumeration.tentative.https.window.js
 create mode 100644 tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
 create mode 100644 tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js
 create mode 100644 tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39-ref.html
 create mode 100644 tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print.html
 delete mode 100644 tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/header-parsing.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/cross-origin-isolated-frame.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/empty-coep.py
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/javascript-url.https.html
 rename tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/{openee-accessed_opener-coop-ro.https.html => access-from-coop-page-to-openee_coop-ro.https.html} (95%)
 rename tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/{opener-accessed_openee-coop-ro.https.html => access-from-coop-page-to-opener_coop-ro.https.html} (92%)
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html
 rename tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/{opener-accessed_opener-coop-ro.https.html => access-to-coop-page-from-openee_coop-ro.https.html} (94%)
 rename tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/{openee-accessed_openee-coop-ro.https.html => access-to-coop-page-from-opener_coop-ro.https.html} (94%)
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resource-popup.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/csp-sandbox.py
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/javascript-url-same-origin.https.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-cleanup.html
 create mode 100644 tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-popup.html
 create mode 100644 tests/wpt/web-platform-tests/html/dom/elements/images/bypass-cache-revalidation.html
 create mode 100644 tests/wpt/web-platform-tests/html/dom/elements/images/image.py
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html
 delete mode 100644 tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html
 create mode 100644 tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js
 create mode 100644 tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html
 create mode 100644 tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js
 rename tests/wpt/web-platform-tests/{idle-detection/idle-detection.idl => interfaces/idle-detection.tentative.idl} (100%)
 create mode 100644 tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
 create mode 100644 tests/wpt/web-platform-tests/interfaces/scroll-to-text-fragment.idl
 delete mode 100644 tests/wpt/web-platform-tests/interfaces/secure-contexts.idl
 create mode 100644 tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/README.md
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/resources/blank.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/resources/input-onmessage.js
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/resources/pending-input-utils.js
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/tentative/same-origin-subframe.sub.html
 create mode 100644 tests/wpt/web-platform-tests/is-input-pending/tentative/toplevel.html
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/reentrancy.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js
 create mode 100644 tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-one-line.html
 create mode 100644 tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html
 create mode 100644 tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html
 create mode 100644 tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html
 create mode 100644 tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html
 rename tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/{underover-parameters-4.html => underover-parameters-4.tentative.html} (99%)
 create mode 100644 tests/wpt/web-platform-tests/mathml/relations/css-styling/multi-column-layout.html
 create mode 100644 tests/wpt/web-platform-tests/mathml/relations/html5-tree/content-editable.html
 create mode 100644 tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-5.html
 create mode 100644 tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
 create mode 100644 tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
 create mode 100644 tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
 create mode 100644 tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js
 create mode 100644 tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js
 create mode 100644 tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html
 rename tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/{data-url.https.html.headers => data-to-javascript-yes.https.html.headers} (100%)
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html
 rename tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/{sandboxed-iframe.sub.https.html.headers => data-url-yes.https.html.headers} (100%)
 delete mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/javascript-url-test.mjs
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html
 create mode 100644 tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
 rename tests/wpt/web-platform-tests/origin-isolation/resources/{child-frame-script.mjs => send-header-page-script.mjs} (76%)
 rename tests/wpt/web-platform-tests/origin-isolation/resources/{child-frame-script.mjs.headers => send-header-page-script.mjs.headers} (100%)
 create mode 100644 tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-iframe.html
 create mode 100644 tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html
 create mode 100644 tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-adjustment_click_target.html
 create mode 100644 tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html
 create mode 100644 tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-x-origin.html
 rename tests/wpt/web-platform-tests/portals/resources/{portal-host-post-message.sub.html => portal-host-post-message.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/portals/resources/portal-post-message-x-origin-portal.html
 create mode 100644 tests/wpt/web-platform-tests/portals/resources/stash-utils.sub.js
 create mode 100644 tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload-style.html
 create mode 100644 tests/wpt/web-platform-tests/raw-sockets/META.yml
 create mode 100644 tests/wpt/web-platform-tests/raw-sockets/README.md
 create mode 100644 tests/wpt/web-platform-tests/raw-sockets/open-consume-activation.https.html
 create mode 100644 tests/wpt/web-platform-tests/raw-sockets/open-securecontext.http.html
 create mode 100644 tests/wpt/web-platform-tests/raw-sockets/open-without-user-gesture.https.html
 create mode 100644 tests/wpt/web-platform-tests/raw-sockets/remotePort-required.https.html
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/image_capture-mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/image_capture.mojom.js
 rename tests/wpt/web-platform-tests/{idle-detection/mock.js => resources/chromium/mock-idle-detection.js} (100%)
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js.headers
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js
 delete mode 100644 tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js
 create mode 100644 tests/wpt/web-platform-tests/sanitizer-api/META.yml
 create mode 100644 tests/wpt/web-platform-tests/sanitizer-api/idlharness.tentative.window.js
 create mode 100644 tests/wpt/web-platform-tests/sanitizer-api/sanitizer-config.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitize.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitizeToString.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/sanitizer-api/support/testcases.sub.js
 create mode 100644 tests/wpt/web-platform-tests/screen-wake-lock/wakelock-released.https.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-none.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-animations/setting-timeline.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/client-redirect.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/idlharness.window.js
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target2.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects.html
 delete mode 100644 tests/wpt/web-platform-tests/secure-contexts/idlharness.any.js
 create mode 100644 tests/wpt/web-platform-tests/selection/contenteditable/collapse.html
 create mode 100644 tests/wpt/web-platform-tests/selection/contenteditable/modify.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/storage/quotachange-in-detached-iframe.tentative.https.html
 create mode 100644 tests/wpt/web-platform-tests/streams/transferable/deserialize-error.window.js
 create mode 100644 tests/wpt/web-platform-tests/streams/transferable/resources/create-wasm-module.js
 create mode 100644 tests/wpt/web-platform-tests/streams/transferable/resources/deserialize-error-frame.html
 create mode 100644 tests/wpt/web-platform-tests/tools/ci/regen_certs.py
 create mode 100644 tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.gitignore
 create mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
 create mode 100644 tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.js
 create mode 100644 tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic/__dir__.headers
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic/classic_script.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/classic_script.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/classic_script.js
 create mode 100644 tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn
 create mode 100644 tests/wpt/web-platform-tests/web-share/feature-policy-listed.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/audio-decoder.html
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/h264.mp4
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/utils.js
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/video-decoder.html
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/video-frame-serialization.html
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/video-frame.html
 create mode 100644 tests/wpt/web-platform-tests/webcodecs/vp9.mp4
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py
 create mode 100644 tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-audio.https.html
 create mode 100644 tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-simulcast.https.html
 create mode 100644 tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.https.html
 create mode 100644 tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.js
 create mode 100644 tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-sender-worker-single-frame.js
 create mode 100644 tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html
 create mode 100644 tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html
 create mode 100644 tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js
 create mode 100644 tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html
 create mode 100644 tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html
 create mode 100755 tests/wpt/web-platform-tests/websockets/handlers/stash_responder_blocking_wsh.py
 delete mode 100644 tests/wpt/web-platform-tests/webstorage/idlharness.window.js
 create mode 100644 tests/wpt/web-platform-tests/webxr/hand-input/idlharness.https.window.js
 delete mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html
 create mode 100644 tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js
 create mode 100644 tests/wpt/web-platform-tests/x-frame-options/deny.html
 delete mode 100644 tests/wpt/web-platform-tests/x-frame-options/deny.sub.html
 create mode 100644 tests/wpt/web-platform-tests/x-frame-options/get-decode-split.html
 create mode 100644 tests/wpt/web-platform-tests/x-frame-options/invalid.html
 delete mode 100644 tests/wpt/web-platform-tests/x-frame-options/invalid.sub.html
 create mode 100644 tests/wpt/web-platform-tests/x-frame-options/multiple.html
 delete mode 100644 tests/wpt/web-platform-tests/x-frame-options/multiple.sub.html
 create mode 100644 tests/wpt/web-platform-tests/x-frame-options/redirect.html
 delete mode 100644 tests/wpt/web-platform-tests/x-frame-options/redirect.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/x-frame-options/support/helper.js
 create mode 100644 tests/wpt/web-platform-tests/x-frame-options/support/helper.sub.js

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/file/File-constructor.html.ini b/tests/wpt/metadata-layout-2020/FileAPI/file/File-constructor.html.ini
new file mode 100644
index 00000000000..5cd88706bde
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/FileAPI/file/File-constructor.html.ini
@@ -0,0 +1,4 @@
+[File-constructor.html]
+  [No replacement when using special character in fileName]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini
new file mode 100644
index 00000000000..17392520cdd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini
@@ -0,0 +1,2 @@
+[border-width-small-values-001-a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini
new file mode 100644
index 00000000000..4fb4cdce41d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini
@@ -0,0 +1,2 @@
+[border-width-small-values-001-b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
new file mode 100644
index 00000000000..3fb853b53f8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
@@ -0,0 +1,2 @@
+[flex-aspect-ratio-img-row-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
new file mode 100644
index 00000000000..3a555b0fc4a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
@@ -0,0 +1,7 @@
+[table-with-percent-intrinsic-width.html]
+  [table 2]
+    expected: FAIL
+
+  [table 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-position.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-position.html.ini
new file mode 100644
index 00000000000..d99383b3d84
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-position.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-background-position.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/animations/tab-size-interpolation.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/animations/tab-size-interpolation.html.ini
new file mode 100644
index 00000000000..f0166fb6c37
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/animations/tab-size-interpolation.html.ini
@@ -0,0 +1,589 @@
+[tab-size-interpolation.html]
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.3) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (-0.3) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (-0.3) should be [1\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (-0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (-0.3) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0) should be [1\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0.3) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-001.html.ini
new file mode 100644
index 00000000000..1d1532d3f05
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-001.html.ini
@@ -0,0 +1,2 @@
+[tab-size-inline-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-002.html.ini
new file mode 100644
index 00000000000..2c86079710a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-inline-002.html.ini
@@ -0,0 +1,2 @@
+[tab-size-inline-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-integer-004.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-integer-004.html.ini
new file mode 100644
index 00000000000..6fa97c35fcd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/tab-size/tab-size-integer-004.html.ini
@@ -0,0 +1,2 @@
+[tab-size-integer-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-002.html.ini
new file mode 100644
index 00000000000..f66d7ce5370
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/eol-spaces-bidi-002.html.ini
@@ -0,0 +1,2 @@
+[eol-spaces-bidi-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-001.html.ini
new file mode 100644
index 00000000000..dd10c6e6aa9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-001.html.ini
@@ -0,0 +1,2 @@
+[trailing-ogham-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-002.html.ini
new file mode 100644
index 00000000000..571770b0949
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-002.html.ini
@@ -0,0 +1,2 @@
+[trailing-ogham-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-003.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-003.html.ini
new file mode 100644
index 00000000000..3a948541d64
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/white-space/trailing-ogham-003.html.ini
@@ -0,0 +1,2 @@
+[trailing-ogham-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/css/cssom/CSSCounterStyleRule.html.ini b/tests/wpt/metadata-layout-2020/css/cssom/CSSCounterStyleRule.html.ini
new file mode 100644
index 00000000000..d631e397542
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom/CSSCounterStyleRule.html.ini
@@ -0,0 +1,4 @@
+[CSSCounterStyleRule.html]
+  [CSSCounterStyleRule.cssText doesn't serialize with newlines]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini b/tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini
new file mode 100644
index 00000000000..ef2b41ef6d4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom/CSSFontFaceRule.html.ini
@@ -0,0 +1,4 @@
+[CSSFontFaceRule.html]
+  [CSSFontFaceRule.cssText doesn't serialize with newlines]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini b/tests/wpt/metadata-layout-2020/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini
new file mode 100644
index 00000000000..e9bf55ee134
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-svg-foreignObject.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini b/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini
index 691c5bc64c7..1c19177769f 100644
--- a/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/mediaqueries/prefers-contrast.html.ini
@@ -32,3 +32,15 @@
   [Should be parseable in JS: '(prefers-contrast: high)']
     expected: FAIL
 
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: more)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: less)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: less)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: more)']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/custom-elements/CustomElementRegistry.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/CustomElementRegistry.html.ini
new file mode 100644
index 00000000000..6d26e8b34bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/custom-elements/CustomElementRegistry.html.ini
@@ -0,0 +1,49 @@
+[CustomElementRegistry.html]
+  [customElements.define must get "observedAttributes" property on the constructor prototype when "attributeChangedCallback" is present]
+    expected: FAIL
+
+  [customElements.define must rethrow an exception thrown while getting formAssociated on the constructor prototype]
+    expected: FAIL
+
+  [customElements.define must rethrow an exception thrown while getting additional formAssociated callbacks on the constructor prototype]
+    expected: FAIL
+
+  [A promise returned by customElements.whenDefined must be resolved by "define"]
+    expected: FAIL
+
+  [customElements.define must rethrow an exception thrown while retrieving Symbol.iterator on disabledFeatures]
+    expected: FAIL
+
+  [customElements.whenDefined must return a new resolved promise each time invoked when the registry contains the entry with the given name]
+    expected: FAIL
+
+  [customElements.define must upgrade elements in the shadow-including tree order]
+    expected: FAIL
+
+  [A promise returned by customElements.whenDefined must be resolved with the defined class once such class is defined]
+    expected: FAIL
+
+  [customElements.whenDefined must return a resolved promise when the registry contains the entry with the given name]
+    expected: FAIL
+
+  [customElements.define must get four additional callbacks on the prototype if formAssociated is converted to true]
+    expected: FAIL
+
+  [customElements.define must rethrow an exception thrown while getting disabledFeatures on the constructor prototype]
+    expected: FAIL
+
+  [customElements.define must rethrow an exception thrown while iterating over disabledFeatures to sequence<DOMString>]
+    expected: FAIL
+
+  [A promise returned by customElements.whenDefined must be resolved with the defined class]
+    expected: FAIL
+
+  [customElements.define must get "prototype", "disabledFeatures", and "formAssociated" property of the constructor]
+    expected: FAIL
+
+  [customElements.define must rethrow an exception thrown while converting the value of disabledFeatures to sequence<DOMString>]
+    expected: FAIL
+
+  [customElements.define must not throw when defining another custom element in a different global object during Get(constructor, "prototype")]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini b/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
index 43ff48a458a..0a32f1b8c1c 100644
--- a/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
+++ b/tests/wpt/metadata-layout-2020/dom/events/Event-dispatch-click.html.ini
@@ -8,3 +8,9 @@
   [disabled checkbox should be checked from dispatchEvent(new MouseEvent("click"))]
     expected: FAIL
 
+  [disabled radio should get legacy-canceled-activation behavior]
+    expected: FAIL
+
+  [disabled checkbox should get legacy-canceled-activation behavior]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/api/request/request-structure.html.ini b/tests/wpt/metadata-layout-2020/fetch/api/request/request-structure.html.ini
new file mode 100644
index 00000000000..d90b69a1a99
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/api/request/request-structure.html.ini
@@ -0,0 +1,7 @@
+[request-structure.html]
+  [Check isReloadNavigation attribute]
+    expected: FAIL
+
+  [Check isHistoryNavigation attribute]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 1ef70aa9010..449b7d8c20f 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,18 +315,27 @@
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index b2ffc8abf78..5c001592859 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/embed.https.sub.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/embed.https.sub.tentative.html.ini
similarity index 91%
rename from tests/wpt/metadata/fetch/metadata/embed.https.sub.html.ini
rename to tests/wpt/metadata-layout-2020/fetch/metadata/embed.https.sub.tentative.html.ini
index 11503224ad1..ae0326e141c 100644
--- a/tests/wpt/metadata/fetch/metadata/embed.https.sub.html.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/embed.https.sub.tentative.html.ini
@@ -1,4 +1,4 @@
-[embed.https.sub.html]
+[embed.https.sub.tentative.html]
   expected: TIMEOUT
   [Wrapper: Navigate to cross-site embed]
     expected: NOTRUN
diff --git a/tests/wpt/metadata-layout-2020/fetch/stale-while-revalidate/stale-image.html.ini b/tests/wpt/metadata-layout-2020/fetch/stale-while-revalidate/stale-image.html.ini
new file mode 100644
index 00000000000..86b30d7f0dd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/stale-while-revalidate/stale-image.html.ini
@@ -0,0 +1,4 @@
+[stale-image.html]
+  [Cache returns stale resource]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fullscreen/api/document-fullscreen-enabled.html.ini b/tests/wpt/metadata-layout-2020/fullscreen/api/document-fullscreen-enabled.html.ini
new file mode 100644
index 00000000000..97dad996961
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fullscreen/api/document-fullscreen-enabled.html.ini
@@ -0,0 +1,4 @@
+[document-fullscreen-enabled.html]
+  [Document#fullscreenEnabled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
new file mode 100644
index 00000000000..9ebc39234dc
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -0,0 +1,13 @@
+[failure-check-sequence.https.html]
+  [CSP check precedes COEP check - CSP header first]
+    expected: FAIL
+
+  [COEP check precedes X-Frame-Options check]
+    expected: FAIL
+
+  [CSP check precedes COEP check - COEP header first]
+    expected: FAIL
+
+  [CSP check precedes X-Frame-Options check]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index 385376c7321..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..16fa2c5cfc1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,4 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
index c4c74f8dac7..14f4195d366 100644
--- a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
@@ -1,22 +1,22 @@
 [canvas-createImageBitmap-e_srgb.html]
   expected: ERROR
   [createImageBitmap in e-sRGB from a transparent e-sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint8, transparency: false]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
     expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a sRGB SVG image with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (BMP, ICO, PNG, WEBP) with resize.]
     expected: FAIL
@@ -25,10 +25,10 @@
     expected: NOTRUN
 
   [createImageBitmap in e-sRGB from a sRGB HTMLVideoElement with resize.]
-    expected: NOTRUN
+    expected: PRECONDITION_FAILED
 
   [createImageBitmap in e-sRGB from an opaque e-sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob with resize.]
     expected: NOTRUN
@@ -52,74 +52,119 @@
     expected: NOTRUN
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (gif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (avif) with resize.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (gif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (jpg) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (avif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (jpg) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (avif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (avif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque e-sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque e-sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint16, transparency: true]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent e-sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent e-sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent e-sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque e-sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint8, transparency: true]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint16, transparency: false]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini
index 185067c00c3..1bfea62ece1 100644
--- a/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini
@@ -1,31 +1,13 @@
 [canvas-createPutGetImageData-colorManaged.html]
-  [Test color managed putImageData: {srgb, uint16} -> {srgb, uint8}]
-    expected: FAIL
-
   [Test color managed cretateImageData: {srgb, float16} -> {srgb, float32}]
     expected: FAIL
 
-  [Test color managed putImageData: {srgb, float32} -> {srgb, uint8}]
-    expected: FAIL
-
   [Test color managed getImageData: {srgb, float16} -> {srgb, float32}]
     expected: FAIL
 
-  [Test color managed putImageData: {srgb, uint16} -> {srgb, float16}]
-    expected: FAIL
-
-  [Test color managed putImageData: {srgb, uint8} -> {srgb, uint8}]
-    expected: FAIL
-
-  [Test color managed putImageData: {srgb, float32} -> {srgb, float16}]
-    expected: FAIL
-
   [Test color managed cretateImageData: {srgb, uint8} -> {srgb, uint8}]
     expected: FAIL
 
-  [Test color managed putImageData: {srgb, uint8} -> {srgb, float16}]
-    expected: FAIL
-
   [Test color managed getImageData: {srgb, uint8} -> {srgb, uint8}]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/dom/elements/images/bypass-cache-revalidation.html.ini b/tests/wpt/metadata-layout-2020/html/dom/elements/images/bypass-cache-revalidation.html.ini
new file mode 100644
index 00000000000..6c43c977094
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/dom/elements/images/bypass-cache-revalidation.html.ini
@@ -0,0 +1,4 @@
+[bypass-cache-revalidation.html]
+  [Images can bypass no-cache]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
index a3cf6d4bf2d..23b7e5619f5 100644
--- a/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/dom/idlharness.https.html.ini
@@ -218,9 +218,6 @@
   [History interface: attribute scrollRestoration]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: attribute direction]
-    expected: FAIL
-
   [SVGElement interface: attribute onwebkitanimationstart]
     expected: FAIL
 
@@ -350,9 +347,6 @@
   [History interface: window.history must inherit property "scrollRestoration" with the proper type]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "direction" with the proper type]
-    expected: FAIL
-
   [ApplicationCache interface: constant UPDATEREADY on interface prototype object]
     expected: FAIL
 
@@ -545,9 +539,6 @@
   [SVGElement interface: attribute onpaste]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: attribute font]
-    expected: FAIL
-
   [ApplicationCache interface: window.applicationCache must inherit property "DOWNLOADING" with the proper type]
     expected: FAIL
 
@@ -635,9 +626,6 @@
   [SVGElement interface: attribute ondragover]
     expected: FAIL
 
-  [Navigator interface: window.navigator must inherit property "languages" with the proper type]
-    expected: FAIL
-
   [DragEvent interface object name]
     expected: FAIL
 
@@ -653,9 +641,6 @@
   [ImageBitmapRenderingContext interface: existence and properties of interface object]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "font" with the proper type]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: operation getContextAttributes()]
     expected: FAIL
 
@@ -764,9 +749,6 @@
   [DataTransferItem interface: attribute type]
     expected: FAIL
 
-  [Navigator interface: attribute languages]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation rect(unrestricted double, unrestricted double, unrestricted double, unrestricted double)]
     expected: FAIL
 
@@ -902,9 +884,6 @@
   [SVGElement interface: attribute onvolumechange]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "textAlign" with the proper type]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: calling isPointInStroke(unrestricted double, unrestricted double) on document.createElement("canvas").getContext("2d") with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -1001,9 +980,6 @@
   [ElementInternals interface: attribute validity]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: attribute textAlign]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation restore()]
     expected: FAIL
 
@@ -1181,9 +1157,6 @@
   [SVGElement interface: attribute onwaiting]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "textBaseline" with the proper type]
-    expected: FAIL
-
   [ApplicationCache interface: window.applicationCache must inherit property "onerror" with the proper type]
     expected: FAIL
 
@@ -1226,9 +1199,6 @@
   [SVGElement interface: attribute onkeydown]
     expected: FAIL
 
-  [CanvasRenderingContext2D interface: attribute textBaseline]
-    expected: FAIL
-
   [CanvasRenderingContext2D interface: document.createElement("canvas").getContext("2d") must inherit property "isPointInStroke(unrestricted double, unrestricted double)" with the proper type]
     expected: FAIL
 
@@ -1648,6 +1618,24 @@
   [Document interface: calling queryCommandState(DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
+  [Window interface: window must inherit property "crossOriginIsolated" with the proper type]
+    expected: FAIL
+
+  [Window interface: window must inherit property "originIsolated" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute isSecureContext]
+    expected: FAIL
+
+  [Window interface: attribute originIsolated]
+    expected: FAIL
+
+  [Window interface: attribute crossOriginIsolated]
+    expected: FAIL
+
+  [Window interface: window must inherit property "isSecureContext" with the proper type]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.*]
   [HTMLTableSectionElement interface: document.createElement("tfoot") must inherit property "align" with the proper type]
@@ -1761,9 +1749,6 @@
   [HTMLElement interface: attribute accessKey]
     expected: FAIL
 
-  [HTMLFormElement interface: attribute rel]
-    expected: FAIL
-
   [HTMLObjectElement interface: document.createElement("object") must inherit property "vspace" with the proper type]
     expected: FAIL
 
@@ -2361,9 +2346,6 @@
   [HTMLInputElement interface: createInput("password") must inherit property "useMap" with the proper type]
     expected: FAIL
 
-  [HTMLFormElement interface: attribute relList]
-    expected: FAIL
-
   [HTMLElement interface: document.createElement("noscript") must inherit property "onauxclick" with the proper type]
     expected: FAIL
 
@@ -2841,9 +2823,6 @@
   [HTMLTableSectionElement interface: document.createElement("tbody") must inherit property "vAlign" with the proper type]
     expected: FAIL
 
-  [HTMLFormElement interface: document.createElement("form") must inherit property "requestSubmit(optional HTMLElement?)" with the proper type]
-    expected: FAIL
-
   [HTMLInputElement interface: createInput("datetime-local") must inherit property "autocomplete" with the proper type]
     expected: FAIL
 
@@ -3042,9 +3021,6 @@
   [HTMLInputElement interface: createInput("radio") must inherit property "useMap" with the proper type]
     expected: FAIL
 
-  [HTMLFormElement interface: document.createElement("form") must inherit property "rel" with the proper type]
-    expected: FAIL
-
   [HTMLIFrameElement interface: attribute allowPaymentRequest]
     expected: FAIL
 
@@ -3177,9 +3153,6 @@
   [HTMLAreaElement interface: document.createElement("area") must inherit property "username" with the proper type]
     expected: FAIL
 
-  [HTMLFormElement interface: document.createElement("form") must inherit property "relList" with the proper type]
-    expected: FAIL
-
   [HTMLImageElement interface: document.createElement("img") must inherit property "loading" with the proper type]
     expected: FAIL
 
@@ -3465,3 +3438,18 @@
   [HTMLLinkElement interface: attribute disabled]
     expected: FAIL
 
+  [HTMLIFrameElement interface: attribute loading]
+    expected: FAIL
+
+  [HTMLMediaElement interface: attribute preservesPitch]
+    expected: FAIL
+
+  [HTMLMediaElement interface: document.createElement("audio") must inherit property "preservesPitch" with the proper type]
+    expected: FAIL
+
+  [HTMLMediaElement interface: new Audio() must inherit property "preservesPitch" with the proper type]
+    expected: FAIL
+
+  [HTMLMediaElement interface: document.createElement("video") must inherit property "preservesPitch" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/dom/idlharness.worker.js.ini b/tests/wpt/metadata-layout-2020/html/dom/idlharness.worker.js.ini
index 4b1a8fa9a3e..5bc8c8c0963 100644
--- a/tests/wpt/metadata-layout-2020/html/dom/idlharness.worker.js.ini
+++ b/tests/wpt/metadata-layout-2020/html/dom/idlharness.worker.js.ini
@@ -50,12 +50,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation fill(optional CanvasFillRule)]
     expected: FAIL
 
-  [WorkerGlobalScope interface: self must inherit property "createImageBitmap(ImageBitmapSource, long, long, long, long, optional ImageBitmapOptions)" with the proper type]
-    expected: FAIL
-
-  [WorkerNavigator interface: attribute languages]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: operation isPointInPath(unrestricted double, unrestricted double, optional CanvasFillRule)]
     expected: FAIL
 
@@ -305,9 +299,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation createImageData(ImageData)]
     expected: FAIL
 
-  [SharedWorker interface: existence and properties of interface object]
-    expected: FAIL
-
   [OffscreenCanvasRenderingContext2D interface: attribute font]
     expected: FAIL
 
@@ -464,9 +455,6 @@
   [Path2D interface: operation addPath(Path2D, optional DOMMatrix2DInit)]
     expected: FAIL
 
-  [WorkerGlobalScope interface: self must inherit property "createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions)" with the proper type]
-    expected: FAIL
-
   [WebSocket interface: new WebSocket("ws://foo") must inherit property "extensions" with the proper type]
     expected: FAIL
 
@@ -476,9 +464,6 @@
   [OffscreenCanvasRenderingContext2D interface: operation clip(optional CanvasFillRule)]
     expected: FAIL
 
-  [WorkerNavigator interface: self.navigator must inherit property "languages" with the proper type]
-    expected: FAIL
-
   [WorkerGlobalScope interface: operation createImageBitmap(ImageBitmapSource, optional ImageBitmapOptions)]
     expected: FAIL
 
@@ -488,3 +473,18 @@
   [ImageBitmapRenderingContext interface: operation transferFromImageBitmap(ImageBitmap?)]
     expected: FAIL
 
+  [WorkerGlobalScope interface: attribute isSecureContext]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "crossOriginIsolated" with the proper type]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "isSecureContext" with the proper type]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: attribute crossOriginIsolated]
+    expected: FAIL
+
+  [WebSocket interface: new WebSocket("ws://invalid") must inherit property "extensions" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 3538891dae8..f45aaafe1c5 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini
new file mode 100644
index 00000000000..b49fbe68d59
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini
@@ -0,0 +1,4 @@
+[fieldset-overflow-cssomview.html]
+  [Test cssom-view API for FIELDSET]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 09ae27d7480..5c3ac06f42a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,6 +171,3 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini
new file mode 100644
index 00000000000..fd0a4743026
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini
@@ -0,0 +1,4 @@
+[no-cuechange-before-play.html]
+  [Ensure that the 'cuechange' event is not fired before video playback has begun.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..93673c2a0db 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index d913fcbb129..3080be9afc0 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
new file mode 100644
index 00000000000..75cdcf5bf04
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
@@ -0,0 +1,2 @@
+[image-compositing-large-scale-change.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini
new file mode 100644
index 00000000000..8195569d430
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini
@@ -0,0 +1,5 @@
+[reload.window.html]
+  expected: TIMEOUT
+  [Reloading a document.open()'d page should reload the URL of the entry realm's responsible document]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini
index a529ddfb39b..1f0d931f6c9 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini
@@ -659,3 +659,57 @@
   [unregisterProtocolHandler: overriding the "tel" protocol should work]
     expected: FAIL
 
+  [registerProtocolHandler: Attempting to override the "web+non*alpha*are*forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+Kelvinsign" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+latinsmallletterlongſ" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "web+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+non*alpha*are*forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+namewithid123" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+Kelvinsign" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+namewithtrailingspace " protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+préfixewithaccent" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+préfixewithaccent" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+spaces are forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+spaces are forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+namewithid123" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+underscores_are_forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+underscores_are_forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "web+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+latinsmallletterlongſ" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+namewithtrailingspace " protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini
new file mode 100644
index 00000000000..c3aabcfe17d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini
@@ -0,0 +1,55 @@
+[protocol.tentative.https.html]
+  [unregisterProtocolHandler: overriding the "ipfs" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "did" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "cabal" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "ethereum" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "dweb" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "ssb" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ethereum" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "did" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "hyper" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "ipns" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ssb" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ipns" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "cabal" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "dat" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "dweb" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "hyper" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ipfs" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "dat" protocol should work]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini
new file mode 100644
index 00000000000..b8a231b14bf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini
@@ -0,0 +1,5 @@
+[cleanup-prevented-with-reference.optional.any.html]
+  expected: ERROR
+
+[cleanup-prevented-with-reference.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini
new file mode 100644
index 00000000000..4fc93faaf3d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini
@@ -0,0 +1,5 @@
+[cleanup-prevented-with-unregister.optional.any.worker.html]
+  expected: ERROR
+
+[cleanup-prevented-with-unregister.optional.any.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini
new file mode 100644
index 00000000000..481060a9e16
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini
@@ -0,0 +1,5 @@
+[gc-has-one-chance-to-call-cleanupCallback.optional.any.worker.html]
+  expected: ERROR
+
+[gc-has-one-chance-to-call-cleanupCallback.optional.any.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini
new file mode 100644
index 00000000000..ebac7a3e870
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini
@@ -0,0 +1,57 @@
+[holdings-multiple-values.optional.any.html]
+  [`""` as registered holding value]
+    expected: FAIL
+
+  [`Symbol(1)` as registered holding value]
+    expected: FAIL
+
+  [`true` as registered holding value]
+    expected: FAIL
+
+  [`undefined` as registered holding value]
+    expected: FAIL
+
+  [Requires FinalizationRegistry.prototype.cleanupSome]
+    expected: FAIL
+
+  [`{}` as registered holding value]
+    expected: FAIL
+
+  [`false` as registered holding value]
+    expected: FAIL
+
+  [`42` as registered holding value]
+    expected: FAIL
+
+  [`null` as registered holding value]
+    expected: FAIL
+
+
+[holdings-multiple-values.optional.any.worker.html]
+  [`""` as registered holding value]
+    expected: FAIL
+
+  [`Symbol(1)` as registered holding value]
+    expected: FAIL
+
+  [`true` as registered holding value]
+    expected: FAIL
+
+  [`undefined` as registered holding value]
+    expected: FAIL
+
+  [Requires FinalizationRegistry.prototype.cleanupSome]
+    expected: FAIL
+
+  [`{}` as registered holding value]
+    expected: FAIL
+
+  [`false` as registered holding value]
+    expected: FAIL
+
+  [`42` as registered holding value]
+    expected: FAIL
+
+  [`null` as registered holding value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/reentrancy.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/reentrancy.optional.any.js.ini
new file mode 100644
index 00000000000..d4990b12ddf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/reentrancy.optional.any.js.ini
@@ -0,0 +1,5 @@
+[reentrancy.optional.any.html]
+  expected: ERROR
+
+[reentrancy.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini
new file mode 100644
index 00000000000..94bfc185df9
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini
@@ -0,0 +1,5 @@
+[return-undefined-with-gc.optional.any.html]
+  expected: ERROR
+
+[return-undefined-with-gc.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini
new file mode 100644
index 00000000000..4ebd816db1f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini
@@ -0,0 +1,5 @@
+[unregister-cleaned-up-cell.optional.any.html]
+  expected: ERROR
+
+[unregister-cleaned-up-cell.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/selection/contenteditable/collapse.html.ini b/tests/wpt/metadata-layout-2020/selection/contenteditable/collapse.html.ini
new file mode 100644
index 00000000000..43deb417587
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/selection/contenteditable/collapse.html.ini
@@ -0,0 +1,10 @@
+[collapse.html]
+  [Selection.collapse() must succeed for the ancestor]
+    expected: FAIL
+
+  [Selection.collapse() must succeed for the descendant]
+    expected: FAIL
+
+  [Selection.collapse() must succeed across siblings]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/selection/contenteditable/modify.tentative.html.ini b/tests/wpt/metadata-layout-2020/selection/contenteditable/modify.tentative.html.ini
new file mode 100644
index 00000000000..aec06f60588
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/selection/contenteditable/modify.tentative.html.ini
@@ -0,0 +1,4 @@
+[modify.tentative.html]
+  [Selection.modify() must not select outside of the host]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini
index 7c4fb302585..48c7ad7182d 100644
--- a/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/metadata-layout-2020/url/a-element-xhtml.xhtml.ini
@@ -50,3 +50,39 @@
   [Parsing: <http://a^b> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <path> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <a/..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </.//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//> against <about:blank>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/url/a-element.html.ini b/tests/wpt/metadata-layout-2020/url/a-element.html.ini
index a2237c8fdef..c5ee053e496 100644
--- a/tests/wpt/metadata-layout-2020/url/a-element.html.ini
+++ b/tests/wpt/metadata-layout-2020/url/a-element.html.ini
@@ -50,3 +50,39 @@
   [Parsing: <http://a^b> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <path> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <a/..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </.//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//> against <about:blank>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini b/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini
index 32594acfcb0..044442fcf41 100644
--- a/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini
+++ b/tests/wpt/metadata-layout-2020/url/url-constructor.html.ini
@@ -50,3 +50,39 @@
   [Parsing: <http://a^b> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <path> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <a/..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </.//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//> against <about:blank>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/url/url-setters.html.ini b/tests/wpt/metadata-layout-2020/url/url-setters.html.ini
index 1a82c2d05ed..3c6a20c7818 100644
--- a/tests/wpt/metadata-layout-2020/url/url-setters.html.ini
+++ b/tests/wpt/metadata-layout-2020/url/url-setters.html.ini
@@ -1,4 +1,5 @@
 [url-setters.html]
+  expected: CRASH
   [<area>: Setting <http://me@example.net>.password = 'secret']
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/wasm/jsapi/memory/constructor.any.js.ini b/tests/wpt/metadata-layout-2020/wasm/jsapi/memory/constructor.any.js.ini
new file mode 100644
index 00000000000..e9ddc18beff
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/wasm/jsapi/memory/constructor.any.js.ini
@@ -0,0 +1,9 @@
+[constructor.any.worker.html]
+  [Proxy descriptor]
+    expected: FAIL
+
+
+[constructor.any.html]
+  [Proxy descriptor]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini
new file mode 100644
index 00000000000..618402237da
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini
@@ -0,0 +1,2 @@
+[extended-audioworkletnode-with-parameters.https.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini
new file mode 100644
index 00000000000..f62de3b230e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini
@@ -0,0 +1,13 @@
+[delay-test.html]
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 1 tasks were failed.]
+    expected: FAIL
+
+  [Executing "test0"]
+    expected: FAIL
+
+  [X Creating ConstantSourceNode(context) and DelayNode(context) incorrectly threw ReferenceError: "DelayNode is not defined".]
+    expected: FAIL
+
+  [X Setting delayTime to 3 frames incorrectly threw TypeError: "delay is undefined".]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/execute.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/execute.py.ini
new file mode 100644
index 00000000000..6dff89cbb55
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/execute_script/execute.py.ini
@@ -0,0 +1,28 @@
+[execute.py]
+  [test_abort_by_user_prompt_twice[confirm\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[confirm\]]
+    expected: FAIL
+
+  [test_ending_comment]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[alert\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt_twice[prompt\]]
+    expected: FAIL
+
+  [test_abort_by_user_prompt[prompt\]]
+    expected: FAIL
+
+  [test_opening_new_window_keeps_current_window_handle]
+    expected: FAIL
+
+  [test_no_browsing_context]
+    expected: ERROR
+
+  [test_abort_by_user_prompt_twice[alert\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini b/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini
new file mode 100644
index 00000000000..c91f0fab159
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webxr/hand-input/idlharness.https.window.js.ini
@@ -0,0 +1,229 @@
+[idlharness.https.window.html]
+  [XRHand interface object name]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRJointPose interface: attribute radius]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: iterable<XRJointSpace>]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRFrame interface: operation fillJointRadii(sequence<XRJointSpace>, Float32Array)]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant WRIST on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRFrame interface: operation getJointPose(XRJointSpace, XRSpace)]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRJointSpace interface object length]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRJointPose interface object name]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant WRIST on interface prototype object]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRFrame interface: operation fillPoses(sequence<XRSpace>, XRSpace, Float32Array)]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRInputSource interface: attribute hand]
+    expected: FAIL
+
+  [XRHand interface: constant RING_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRJointPose interface object length]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: attribute length]
+    expected: FAIL
+
+  [XRHand interface object length]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: operation joint(unsigned long)]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRJointSpace interface object name]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_METACARPAL on interface prototype object]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini
deleted file mode 100644
index fe8654e447c..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/WorkerGlobalScope-close.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[WorkerGlobalScope-close.html]
-  [Test sending a message after closing.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/workers/Worker_script_mimetype.htm.ini b/tests/wpt/metadata-layout-2020/workers/Worker_script_mimetype.htm.ini
new file mode 100644
index 00000000000..979060db2cd
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/Worker_script_mimetype.htm.ini
@@ -0,0 +1,4 @@
+[Worker_script_mimetype.htm]
+  [HTTP(S) URLs which respond with text/plain MIME type must not work]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini
new file mode 100644
index 00000000000..5ea9043210b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini
@@ -0,0 +1,8 @@
+[message-classic-DOMException.html]
+  expected: TIMEOUT
+  [Throw DOMException-TypeError in onerror: classic: handler]
+    expected: TIMEOUT
+
+  [Throw DOMException-TypeError in onerror: classic: listener]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini
new file mode 100644
index 00000000000..037022cd8ac
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini
@@ -0,0 +1,8 @@
+[message-classic-Error.html]
+  expected: TIMEOUT
+  [Throw Error in onerror: classic: handler]
+    expected: TIMEOUT
+
+  [Throw Error in onerror: classic: listener]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini
new file mode 100644
index 00000000000..9470cff7a9a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini
@@ -0,0 +1,8 @@
+[message-module-DOMException.html]
+  expected: TIMEOUT
+  [Throw DOMException-TypeError in onerror: module: handler]
+    expected: TIMEOUT
+
+  [Throw DOMException-TypeError in onerror: module: listener]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
new file mode 100644
index 00000000000..abfd454634f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
@@ -0,0 +1,8 @@
+[message-module-Error.html]
+  expected: TIMEOUT
+  [Throw Error in onerror: module: listener]
+    expected: TIMEOUT
+
+  [Throw Error in onerror: module: handler]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/FileAPI/file/File-constructor.html.ini b/tests/wpt/metadata/FileAPI/file/File-constructor.html.ini
new file mode 100644
index 00000000000..5cd88706bde
--- /dev/null
+++ b/tests/wpt/metadata/FileAPI/file/File-constructor.html.ini
@@ -0,0 +1,4 @@
+[File-constructor.html]
+  [No replacement when using special character in fileName]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: 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/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 63cfb71915e..9e0ccc96ae1 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -242,6 +242,20 @@
        {}
       ]
      ],
+     "spanning-legend-000-crash.html": [
+      "407697e8433e87835d9d5101825302d3a360e53d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "spanning-legend-001-crash.html": [
+      "6126ec61e24c779f05438578c17737432316f8a0",
+      [
+       null,
+       {}
+      ]
+     ],
      "with-custom-layout-on-same-element-crash.https.html": [
       "7e1c804258ab54290047a4b712f0bff613acd168",
       [
@@ -292,8 +306,8 @@
      ]
     },
     "css-pseudo": {
-     "file-chooser-button-display-toggle-crash.tentative.html": [
-      "4e43609bee8cfd6cc9881be865abd37af2626a74",
+     "file-selector-button-display-toggle-crash.tentative.html": [
+      "bc9f24ae0194fc3b59a1f0da7e8c2e13cf9eb9c5",
       [
        null,
        {}
@@ -312,6 +326,13 @@
        null,
        {}
       ]
+     ],
+     "placeholder-input-dynamic-crash.html": [
+      "28ab898a6d906bec3aab6891f1fe333d3ccf23f5",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-scroll-anchoring": {
@@ -445,6 +466,24 @@
       ]
      ]
     },
+    "cssom": {
+     "removerule-invalidation-crash.html": [
+      "a83f43d5faf62338cfb442468a6e9e0e011c79f2",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
+    "cssom-view": {
+     "client-props-root-display-none-crash.html": [
+      "654e321e420b3ccb6a0a986e4b9b5aa1fbbf4c8d",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "filter-effects": {
      "crashtests": {
       "multiple-references-id-crash-001.html": [
@@ -584,6 +623,20 @@
          null,
          {}
         ]
+       ],
+       "multicol-legend-becomes-floated-crash.html": [
+        "0e7f87232abb99000e7bc351dd73aee207c3b13a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "second-legend-becomes-rendered-legend-crash.html": [
+        "6e36b3bb5aed7550b12bcbdf7a94d9f8fd372687",
+        [
+         null,
+         {}
+        ]
        ]
       }
      },
@@ -967,7 +1020,7 @@
      ]
     },
     "idlharness-manual.html": [
-     "199f49db4dba45ffd0ea610f7253e1bcc794d1ea",
+     "c1d8b0c7149d75ede72aa38a55a8d0db689c2b64",
      [
       null,
       {}
@@ -8736,6 +8789,15 @@
       ]
      ]
     },
+    "css-cascade": {
+     "important-transition-manual.html": [
+      "b9abed469f3ff123f4639095e78c65ce0ec18ba0",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "css-counter-styles": {
      "arabic-indic": {
       "css3-counter-styles-101.html": [
@@ -14706,8 +14768,8 @@
       {}
      ]
     ],
-    "idlharness-manual.html": [
-     "72bdf67dfa678b2b2c7a7f203df656c069e165fe",
+    "idlharness-manual.window.js": [
+     "9f2731bf1d02576ea5a597fe94b0e2277f3f8fbf",
      [
       null,
       {}
@@ -17595,14 +17657,14 @@
      ]
     ],
     "showOpenFilePicker-manual.https.html": [
-     "2289b8f8d8bb98ab45f38f51f6a6123967ecee9c",
+     "370aa45c57807baca125219a65866cba9d029a59",
      [
       null,
       {}
      ]
     ],
     "showSaveFilePicker-manual.https.html": [
-     "451a0fb9c7ff3cc3e2bd1aba92c8d8412f9cb0b6",
+     "3a20f1428d903ac518bfbaa668cbc754166eb0ce",
      [
       null,
       {}
@@ -18472,7 +18534,7 @@
    },
    "screen-wake-lock": {
     "wakelock-document-hidden-manual.https.html": [
-     "550dc831cbcd4909746893a5675c5a0308425805",
+     "05368bdfb89b2fd9e4ea442b4124fa784babfc10",
      [
       null,
       {}
@@ -24307,9 +24369,24 @@
   },
   "print-reftest": {
    "css": {
+    "css-break": {
+     "break-nested-float-in-table-001-print.html": [
+      "e4e0a578e9a6c6d763fcb9e80d6ff8b91561f3e5",
+      [
+       null,
+       [
+        [
+         "/css/css-break/break-nested-float-in-table-001-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    },
     "css-flexbox": {
      "break-nested-float-in-flex-item-001-print.html": [
-      "1994190bf9432a53e696909d9432b17b244ab819",
+      "2fbf939f6a54c9056b4bd39fe0466f0df25f0bb0",
       [
        null,
        [
@@ -24322,7 +24399,7 @@
       ]
      ],
      "break-nested-float-in-flex-item-002-print.html": [
-      "83f47c47250a3b424276376505973bbb8162da26",
+      "cc6037a87132d343e8ecfc6d633685a76ea92e15",
       [
        null,
        [
@@ -24335,6 +24412,34 @@
       ]
      ]
     },
+    "css-fonts": {
+     "downloadable-font-in-iframe-print.html": [
+      "0cd7c4a9bcde812899679144a4a978f2e407975c",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/downloadable-font-in-iframe-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "downloadable-font-print.html": [
+      "5d23073d8fc6316e6abf6c10584d32695c142bbe",
+      [
+       null,
+       [
+        [
+         "/css/css-fonts/downloadable-font-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    },
     "css-multicol": {
      "column-balancing-paged-001-print.html": [
       "cf8e343d0fff9c576ad88f00a4f68b310bf0e65d",
@@ -24349,9 +24454,41 @@
        {}
       ]
      ]
+    },
+    "css-values": {
+     "viewport-units-001-print.html": [
+      "3bff494e535b9101a11222a40a382384415eee3f",
+      [
+       null,
+       [
+        [
+         "/css/css-values/viewport-units-001-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
     }
    },
    "html": {
+    "browsers": {
+     "windows": {
+      "iframe-nested-print.html": [
+       "844f6ba3734e7a68b9555a287619445d32b83c5b",
+       [
+        null,
+        [
+         [
+          "/html/browsers/windows/iframe-nested-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     }
+    },
     "rendering": {
      "non-replaced-elements": {
       "tables": {
@@ -118071,7 +118208,7 @@
        ]
       ],
       "mix-blend-mode-svg-rectangle.html": [
-       "e74181e2c35bd0ba1b78eadb84640d321dfa6577",
+       "543586f0983b7d93a472964fd18822425d6034b2",
        [
         null,
         [
@@ -123310,6 +123447,19 @@
        {}
       ]
      ],
+     "border-radius-012.html": [
+      "e3b97e2ea7b7793becf4e31e9e79f0ed7118aeeb",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/border-radius-012-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-radius-clipping-002.html": [
       "eea0ee104fc2610a722f5bbae200c8f6d1ac9823",
       [
@@ -123557,6 +123707,71 @@
        {}
       ]
      ],
+     "border-width-small-values-001-a.html": [
+      "d5354a3585469bbec045a8d14193fc3332e83d0f",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-width-small-values-001-ref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "border-width-small-values-001-b.html": [
+      "ccb5004a64f584a5d26ed636519f945dd3c7580f",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-width-small-values-001-ref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "border-width-small-values-001-c.html": [
+      "43651fe2312bbdb1f4a5bd2914ee8e94c6c4076f",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-width-small-values-001-ref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "border-width-small-values-001-d.html": [
+      "11ff8b5c5553d5bff1ceff5da36a4342a650610c",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-width-small-values-001-ref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "border-width-small-values-001-e.html": [
+      "5fc44349834938dc6b3d6ba60334bcd7737d1a40",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/border-width-small-values-001-ref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
      "box-shadow-005.html": [
       "705ced279d30e6113eed68b819b287f7e48219cd",
       [
@@ -123870,7 +124085,7 @@
       ]
      ],
      "css3-border-image-repeat-repeat.html": [
-      "001e52a003cd3669fd574ebfa629650f2d8ac229",
+      "1b8e7588d261e9478cbe35a68039b0da06c900e3",
       [
        null,
        [
@@ -123883,7 +124098,7 @@
       ]
      ],
      "css3-border-image-repeat-stretch.html": [
-      "d9e1fc03e6f131c5a181422a83de263b5f9a357a",
+      "c83cf383725572c0ebc6c19146416ad59ab2847f",
       [
        null,
        [
@@ -123934,6 +124149,19 @@
        {}
       ]
      ],
+     "inline-background-rtl-001.html": [
+      "a7149e2f3c83acf175b5de4f8bcbf63a2c20d4f1",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/reference/inline-background-rtl-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "inset-box-shadow-scroll.html": [
       "7eca4ea544ff76740e13490fb995dfda5705336d",
       [
@@ -124198,6 +124426,110 @@
        {}
       ]
      ],
+     "borders-000.html": [
+      "7c79f4c0d405bf8342987c6e66b759f6937b4485",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-000-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-001.html": [
+      "2fa8c8c96fc65eaadbc1ea5fedeb6f0313aa8816",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-002.html": [
+      "b8bc3a4848b014d5ce293bd7f0a54a1765e2d96a",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-003.html": [
+      "f3d9410d0cd4672add12d370de7aa059d787aa83",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-004.html": [
+      "5ffca58757e879887babdaad18c27145c5ddb468",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-005.html": [
+      "a96c4e42eccc4e01f6608333809aafab3b6003a4",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-006.html": [
+      "a2c59f7b99702e88d1326c5a6f56e582243e5606",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-006-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "borders-007.html": [
+      "d7c5f0568ae59261b6051282c0119d52d7791430",
+      [
+       null,
+       [
+        [
+         "/css/css-break/borders-007-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "break-at-end-container-edge-000.html": [
       "4836f399de4fc8af657ff7729215ee7e89054798",
       [
@@ -124406,6 +124738,45 @@
        {}
       ]
      ],
+     "fieldset-002.html": [
+      "aea8cec5d432e33fb86165f6db10a11c0929e8c1",
+      [
+       null,
+       [
+        [
+         "/css/css-break/fieldset-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "fieldset-003.html": [
+      "6c23a4b93e4233c40d97347d4189583eeb49c9b4",
+      [
+       null,
+       [
+        [
+         "/css/css-break/fieldset-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "fieldset-004.html": [
+      "ce832f82985383bd30389a0555b3864d11c32e17",
+      [
+       null,
+       [
+        [
+         "/css/css-break/fieldset-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "fieldset.html": [
       "fe76988293b8d1d9a6226b23bb9b40e86fcc007a",
       [
@@ -124786,7 +125157,7 @@
     },
     "css-cascade": {
      "all-prop-001.html": [
-      "59b466722f5beffc5c1ce4577a0fa6274f6fd6f7",
+      "2fe110fb278a135e7279a99f457b4bdb0dc58ca6",
       [
        null,
        [
@@ -124876,8 +125247,21 @@
        {}
       ]
      ],
+     "import-conditional-001.html": [
+      "9bdbbcb5a32b638d2275cd86f0b9f2bbd026ebdc",
+      [
+       null,
+       [
+        [
+         "/css/css-cascade/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "important-prop.html": [
-      "5a3dad10897d27cf6d476705cd5ae76dc4be5c1f",
+      "cf964077165c7af3401ab2d8f6fef03e4d3f2442",
       [
        null,
        [
@@ -124929,7 +125313,7 @@
       ]
      ],
      "unset-val-001.html": [
-      "c25b980a3b5734df4782ee5b6feb32d845f19e6d",
+      "a3d60947b22a6f68b6cb4d81d0ff328f40b4f9c2",
       [
        null,
        [
@@ -134799,6 +135183,19 @@
        {}
       ]
      ],
+     "flex-aspect-ratio-img-row-006.html": [
+      "2d6f0857a2e54391da34453fbc355b3834ee6d06",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flex-base.html": [
       "93401d3fe32716ca14a3f7f3be4f0fa64a7fabf2",
       [
@@ -144628,6 +145025,19 @@
          {}
         ]
        ],
+       "grid-self-baseline-008.html": [
+        "5398b7e9c1bab53b145774cb9b48e3615ef69af7",
+        [
+         null,
+         [
+          [
+           "/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "grid-self-baseline-changes-grid-area-size-001.html": [
         "5b2ecaaab06b1f86397818fe5522cbc1e0a2f55a",
         [
@@ -149375,6 +149785,35 @@
         }
        ]
       ],
+      "image-orientation-background-position.html": [
+       "cf4fcd4a301c2025b964a42065a3646dc6d4deaa",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             10,
+             10
+            ],
+            [
+             100,
+             100
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "image-orientation-background-properties.html": [
        "45651286b176df4a93e3237425458c07fabfdda9",
        [
@@ -152450,6 +152889,32 @@
        {}
       ]
      ],
+     "counter-list-item-2.html": [
+      "959ff6660cabb8896f8520a88de560745919f61d",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-list-item-2-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "counter-list-item-3.html": [
+      "096fdfbc2892dda989741e04b004c31c710536d6",
+      [
+       null,
+       [
+        [
+         "/css/css-lists/counter-list-item-3-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "counter-list-item.html": [
       "c0b89d49fd0bb38cacb71e7d875ba29bab31da70",
       [
@@ -153157,6 +153622,19 @@
         {}
        ]
       ],
+      "clip-no-stacking-context.html": [
+       "cbd07ee638082480ccb33285fa63c4fe347bedba",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip/clip-no-stacking-context-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-not-absolute-positioned-001.html": [
        "613f6afebc4a53b6b5b6019cabeb0fab4460b894",
        [
@@ -154069,6 +154547,19 @@
         {}
        ]
       ],
+      "clip-path-rotated-will-change-transform.html": [
+       "a609e9cc91591b853db9713f7e981ecc4f666abb",
+       [
+        null,
+        [
+         [
+          "/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "clip-path-scroll.html": [
        "880fd8b77a603147cc2a4a3660bcabe74e427bba",
        [
@@ -159142,7 +159633,7 @@
     },
     "css-overflow": {
      "clip-001.html": [
-      "84bf8cdae55431f00f01358c93712074029fa815",
+      "dacb658db6458e67832b454ebd6887a8a04b9349",
       [
        null,
        [
@@ -159154,8 +159645,60 @@
        {}
       ]
      ],
+     "clip-002.html": [
+      "cd8b9a3cbeb632c4ce6031cee39a3cbf519b5164",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/clip-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "clip-003.html": [
+      "0c7e9bfa25489b7be6e4b2ead30cfe615eab7eda",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/clip-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "clip-004.html": [
+      "30dde4a5e12ac7b918c76b7c6bffa41c01fa7c30",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/clip-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "clip-005.html": [
+      "e55f4b22fcb7e0fd5ebc0fd58221404805209f92",
+      [
+       null,
+       [
+        [
+         "/css/css-overflow/clip-005-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "dynamic-visible-to-clip-001.html": [
-      "b97701bfb299b5b9fc06b774f489b2e2285b2c13",
+      "e2011324dda6e00309bf70c2e364fdb2dd1f23ae",
       [
        null,
        [
@@ -159272,7 +159815,7 @@
       ]
      ],
      "overflow-body-propagation-007.html": [
-      "9ce13ed8de359a9e3d79f27f4eced40d6115cb1a",
+      "ee6e1a1cc69df09571ab5f49ed3f18d85f7cf3a9",
       [
        null,
        [
@@ -159285,7 +159828,7 @@
       ]
      ],
      "overflow-body-propagation-008.html": [
-      "867cd379c73ebdb348ef0d30285946e43ef7051f",
+      "7da4a5a7504ab63a8ff27820155e746b7c69b685",
       [
        null,
        [
@@ -159298,7 +159841,7 @@
       ]
      ],
      "overflow-body-propagation-009.html": [
-      "6924719f97872021cefa31f920e7619ec2208747",
+      "33cb079487b9f6ea5db5152e447747bbdf3bdad1",
       [
        null,
        [
@@ -161643,6 +162186,19 @@
        {}
       ]
      ],
+     "position-absolute-large-negative-inset.html": [
+      "ed17ea91d5e134d097fca9a600ee3f97872a1e00",
+      [
+       null,
+       [
+        [
+         "/css/css-position/position-absolute-large-negative-inset-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "position-absolute-root-element-flex.html": [
       "ed1e4903d807276246f2e212c6c2dd10d349739a",
       [
@@ -161695,6 +162251,19 @@
        {}
       ]
      ],
+     "position-fixed-scroll-nested-fixed.html": [
+      "64586a207ed4b96c8e803f262e98e387f217f63a",
+      [
+       null,
+       [
+        [
+         "/css/css-position/position-fixed-scroll-nested-fixed-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "position-relative-001.html": [
       "7ec9e4f767b4548e52e92b358b59e51376dea389",
       [
@@ -162805,7 +163374,7 @@
       ]
      ],
      "active-selection-031.html": [
-      "387bb82082f3a13cd5867aefa33b44d836d18eb8",
+      "e5c68814526d85bf1b3d68a2d57cab2562720b53",
       [
        null,
        [
@@ -162999,13 +163568,13 @@
        {}
       ]
      ],
-     "file-chooser-button-001.tentative.html": [
-      "99c67dee5d96f600479492d862f304eea426c6b0",
+     "file-selector-button-001.tentative.html": [
+      "48b2852de820f61ce5344584ab1ff3aa2313adcf",
       [
        null,
        [
         [
-         "/css/css-pseudo/file-chooser-button-001-notref.html",
+         "/css/css-pseudo/file-selector-button-001-notref.html",
          "!="
         ]
        ],
@@ -163796,6 +164365,19 @@
        {}
       ]
      ],
+     "marker-content-023.html": [
+      "9ec0ca46e4290dad6b9e3456b76602d05ab5e7c0",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-content-023-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "marker-display-dynamic-001.html": [
       "c06da7ca803455559a7a12b915d9083b32106cd1",
       [
@@ -163874,6 +164456,19 @@
        {}
       ]
      ],
+     "marker-hyphens.html": [
+      "a63e3deaf9be852bf4233eddf21c5b24b8747ee3",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-hyphens-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "marker-inherit-line-height.html": [
       "de34c2f7ae33654f6b19d65ba7b2acdf0bfc7b0f",
       [
@@ -163913,6 +164508,36 @@
        {}
       ]
      ],
+     "marker-letter-spacing.html": [
+      "8a89e1792159a6bf9b364aba96464c5f4eb91547",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-letter-spacing-ref-001.html",
+         "=="
+        ],
+        [
+         "/css/css-pseudo/marker-letter-spacing-ref-002.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-line-break.html": [
+      "7577822bce32335d6993d15f22850b95267d7e3b",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-line-break-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "marker-list-style-position.html": [
       "9b122bc3e9b6200fbf33c1c7d3da2ba155ff1691",
       [
@@ -163930,6 +164555,45 @@
        {}
       ]
      ],
+     "marker-overflow-wrap.html": [
+      "29d9cf778493b365ec088c124cfe8b0e77b3c215",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-line-break-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-tab-size.html": [
+      "a521f58bc80c4445ac61714a4f099b7dadfbee4a",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-tab-size-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-text-align.html": [
+      "c5f8ed3a2016a55039b3f94dc93780b5517b35a3",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-text-align-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "marker-text-combine-upright.html": [
       "64b37a0c7d4355c560cdf02f078ddd65f252b2d9",
       [
@@ -163943,6 +164607,45 @@
        {}
       ]
      ],
+     "marker-text-decoration-skip-ink.html": [
+      "153e9221a39bbba6f4401ca39b45505468c666ce",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-text-decoration-skip-ink-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-text-emphasis.html": [
+      "db9fb3d5257b2467c7178e7ab245598f80a6f54b",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-text-emphasis-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-text-shadow.html": [
+      "3f8ae566f164f80f0487601b6292c283a8076e93",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-text-shadow-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "marker-text-transform-default.html": [
       "922c5b0de27b3f4bd58765242e9027390d4eba77",
       [
@@ -164021,6 +164724,32 @@
        {}
       ]
      ],
+     "marker-word-break.html": [
+      "4e3aeaebd88159cd0ac7b9a48c31151c4da99d3f",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-word-break-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "marker-word-spacing.html": [
+      "a98f0bd7763f5bec7ccbabfe521b80cf0d7bc263",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/marker-word-spacing-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "outside-marker-paint-order.html": [
       "94d0c42eca8cffbd5637a1039028925c19e1f851",
       [
@@ -164099,6 +164828,32 @@
        {}
       ]
      ],
+     "selection-overlay-and-grammar-001.html": [
+      "e4fe6e682e63f9382f920fbabf2126fc80640308",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "selection-overlay-and-spelling-001.html": [
+      "64129ab5f56b85ba901645f1128e35e27a9c64c2",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "selection-text-shadow-016.html": [
       "44403c1b5f5fb2bf7245c73f5eb5c15ffd19a98a",
       [
@@ -165664,6 +166419,32 @@
        ],
        {}
       ]
+     ],
+     "vertical-rl-viewport-size-change-000.html": [
+      "ee367b1c9718e6d353dbaaaa922f9e13546a7734",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "vertical-rl-viewport-size-change-001.html": [
+      "0e58a1e63b10d68e0aae1ff0ba6ec0c7b1f726e9",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "css-scroll-snap": {
@@ -165962,6 +166743,73 @@
     },
     "css-shapes": {
      "shape-outside": {
+      "assorted": {
+       "float-retry-push-circle.html": [
+        "d8077c670fe24c5c08deb40bd3553e1a59696121",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "float-retry-push-image.html": [
+        "7087797c89da1d2adc93964e8ea30de16aeb4c23",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "float-retry-push-inset.html": [
+        "f24a0e68f4eb1fc9217c93eef823c68d8905f735",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "float-retry-push-polygon.html": [
+        "3471d1b34649f08fd81c2236f033efb1b852b826",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "float-should-push.html": [
+        "4901b8b5c77bd40b66f8d24b9c861533707f1454",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ]
+      },
       "formatting-context": {
        "shape-outside-formatting-context.tentative.html": [
         "cfb5d46a0db6745a4aa735b51342d198e2ab80ec",
@@ -165978,6 +166826,188 @@
        ]
       },
       "shape-box": {
+       "shape-outside-border-box-001.html": [
+        "a033c719967dd8288ec619c9b96ad70717d71bfc",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-002.html": [
+        "a4b2cbe3246eb87cabffce7b8c0714c48e957340",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-001.html": [
+        "2ede1bb6539caff8b4043dd05ac8cf010a90864e",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-002.html": [
+        "2ee704a7af5af13d979db2c4dd8514f1bd16050a",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-003.html": [
+        "bce4ee51d12bb4f0a8a22251891b0b0ab9953fa1",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-004.html": [
+        "0e8cf24fd59a91cc87675c48f01ca0f76578fa00",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-005.html": [
+        "c76bc98afa62cb327a710fc6aeeee7e3bda7bd4c",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-006.html": [
+        "7303cb137206a7e761c06fba1aa259bee2768071",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-007.html": [
+        "0ece2a05183915351e5cd0d9a494fd2c3c54f28f",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-008.html": [
+        "4dfe51733493f415adfbd5fe0bfe0fd0ef9aba99",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-009.html": [
+        "cfee5469bdb890982e36496dccb56a600f31587d",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-010.html": [
+        "2ddb37bd7f325f18966b081505cc9cfd22753d67",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-011.html": [
+        "acc188d7a1e86e727201af66b0e32cacdcb0e2dd",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-border-box-border-radius-012.html": [
+        "ccacd49d1182a80e945f1f373b47fae19116f255",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "shape-outside-box-002.html": [
         "76a9bbb1525f4896f5d742b91bce755f04fc1bc2",
         [
@@ -166068,6 +167098,240 @@
          ],
          {}
         ]
+       ],
+       "shape-outside-content-box-001.html": [
+        "76a3098c658ad130823ef688980d1fc29b70961d",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-content-box-002.html": [
+        "bacb7ad0c0c4aadac95cf257d8ec98bc70f8da69",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-content-box-border-radius-001.html": [
+        "a467bccf3365ff7e2126a4000afd6390391c660c",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-content-box-border-radius-002.html": [
+        "9be47d5ee194d8aaa508816a3042653ac46f9605",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-001.html": [
+        "8f6555df360026c7a1a0d1df3170d3c734d80625",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-002.html": [
+        "6f9cdc02b43438f7e153dec055446105a35f1953",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-001.html": [
+        "2fbe5d29583184d7afd5677a2c2132750dc07849",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-002.html": [
+        "6023e6e239a4140f00905b3e14b95b3db03588ff",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-003.html": [
+        "562090270323ea2e4c83a42e4e22b588f53a011a",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-004.html": [
+        "33269ae1782b9345bd02672d14a538e31a023ff7",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-005.html": [
+        "cb7e707b1e673d297f4531ade5311bb76e7214af",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-006.html": [
+        "4a5beee924ef47210b8ee564890c73486fe26002",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-007.html": [
+        "b1871ed36e3ca608282a52a3e505294e66ba1e7f",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-margin-box-border-radius-008.html": [
+        "70df0bb243c7bc6b7f1962808b1e91b4cc5b2e55",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-padding-box-001.html": [
+        "74d6227c6830c872b3642202c361d2d211b4d794",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-padding-box-002.html": [
+        "a22978f10e0dcbea5701a170d0a97c84e1ddfd65",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-padding-box-border-radius-001.html": [
+        "66df1ac59d75036d4ffc4813c505f0950cc79195",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "shape-outside-padding-box-border-radius-002.html": [
+        "8ebb7df2c8898c8c2cc5fbcfd7825750a6b40595",
+        [
+         null,
+         [
+          [
+           "/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
        ]
       },
       "shape-image": {
@@ -166881,6 +168145,279 @@
           ],
           {}
          ]
+        ],
+        "shape-outside-circle-032.html": [
+         "a9f404813ef53d880e201fd65b1e8c014f8a870d",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-033.html": [
+         "9d2b0d89f8e9f545afe542a3306457273cfc4edb",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-034.html": [
+         "c9e978ab1e577d6f79eaec4d48dd586123c3fe71",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-035.html": [
+         "348cdd31f2cbeb1b204f67c232eefa9ecd45d9e9",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-036.html": [
+         "876d2fda4856e94ac7f0753d945fff888ec42ae6",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-037.html": [
+         "5cb146b50b66022ad387d98f20aa7bb30b32d185",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-038.html": [
+         "be540c71da4a04307f765c6d94f38c7fbecc9f99",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-041.html": [
+         "9b7ae67f75dd40f0ee8a18f11664556e9a0f6e13",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-042.html": [
+         "8e2ee351a83b64b80d6a5a6b8647c98040ada2f0",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-043.html": [
+         "3393a1610a3c1dc320db34d30280aa722949ef6b",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-044.html": [
+         "ce0f667c5440c2f13db4372d84da90460ec3f9b5",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-047.html": [
+         "a909c152c62cb2195b57fba24b2d19ac6717133d",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-048.html": [
+         "d6f3e8993b069dab70c4e6973548a1aa6e68b00a",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-049.html": [
+         "8f51a7ce14630caa0a5019f726fc0c8ea265b084",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-050.html": [
+         "784f70ec8707c09ed91a1cbb28cd0f5371283834",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-051.html": [
+         "d487af8a9cbe849ac8bd54a3a331f078a370cee6",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-052.html": [
+         "ad908cf6aaa6323709028d3324d2dda98b98b538",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-053.html": [
+         "8e6532d935c6ea7a1ca0f6d05a56bd7da7607f99",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-054.html": [
+         "4f96f2d67c04cccbe9b7a6239f83803362e536c6",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-055.html": [
+         "611984b26f73086c9a0da508673bfebe66a4e131",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-circle-056.html": [
+         "f708d1f628254bcfc9018676ebd56dd3ef43bcaa",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
         ]
        },
        "ellipse": {
@@ -167078,6 +168615,279 @@
           ],
           {}
          ]
+        ],
+        "shape-outside-ellipse-032.html": [
+         "0917d096c81a0e2c22a4306f0064cbee4b2876d5",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-033.html": [
+         "d761a48f07288ee494b2b4162f54e6778305eb04",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-034.html": [
+         "f32747015e8c6dfe333adc5df2c79b048d1b5e2a",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-035.html": [
+         "c98eb061e3c7ab73252815605dcf382ba6560c3d",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-036.html": [
+         "dd2194ead8f7071eca08f759f9ddd790896d6661",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-037.html": [
+         "70c9a0335793989fb8b9974325ee47351c3ec7be",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-038.html": [
+         "190ae662a939138d17e6aa48309e417c650d10a0",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-039.html": [
+         "5a76fbd762884ec79a299c2e274295548928bfae",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-040.html": [
+         "70db3c0ae37c12caadbefbad24de3b28bf32de56",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-041.html": [
+         "304382ef206c8566ed712792e6fd6c7364bb4cfb",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-042.html": [
+         "4056a8617d59a011121266549c2ef9662a4545ed",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-043.html": [
+         "3cd8896568f2ec33fcd85a4a9bac87152d1ee515",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-044.html": [
+         "4e5cb5420494bb7871fd040df009f965a2788c2c",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-045.html": [
+         "0c56b7484e302f92e6fb7ab2bf989ee4f8a35de7",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-046.html": [
+         "cb531521646de3e2ef7889f66c1437aeab587c3d",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-047.html": [
+         "85f8ee4c13777723cc627b5b5eb4e27370ae632b",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-048.html": [
+         "5d993266e961aca2236d9266b02965fbb84e3418",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-049.html": [
+         "612ba938d130152689f01f3fdc432a6c0bcef467",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-050.html": [
+         "84371638ea8f7b6affa5ec493816ad08f63cd906",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-051.html": [
+         "cca37cf9fbd7f7d9782ddb401012144a86337334",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-ellipse-052.html": [
+         "25f89533de202f6d83d78595d52258eed9026e41",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
         ]
        },
        "inset": {
@@ -167159,6 +168969,136 @@
           {}
          ]
         ],
+        "shape-outside-inset-016.html": [
+         "ecf4a9ddf71f3eef32712a9e0c91ec097b564efd",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-017.html": [
+         "7e0f23299ceed095fcc70958bd6b1b577568f6f3",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-020.html": [
+         "204e4d40c67ec57ed64709eedb5795c303ddc852",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-021.html": [
+         "218f59cf9d981d2ec503e9ac4955f583030c6a58",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-022.html": [
+         "69a2d48544f42b0386fd537c3c04b0411e90c1b6",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-023.html": [
+         "f4d8bd09377bbfd23535ccb51830bdd70cae7a0f",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-024.html": [
+         "d1cfcfbd29323e8aa83e8063d3eb3f7de83b7ea2",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-025.html": [
+         "40c01941ea822a990a1cb43f9c1e653eb8b8e2c8",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-026.html": [
+         "6bacd729533545d14a2b60a4c096bb4ef5e88351",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-inset-027.html": [
+         "ca7893c71c0bb2f4e59dcea18c8ccab312d89606",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
         "shape-outside-inset-028.html": [
          "625d3463d39f54fea15b9210990ce93aff7cb8b5",
          [
@@ -167355,6 +169295,123 @@
           ],
           {}
          ]
+        ],
+        "shape-outside-polygon-018.html": [
+         "4509c1cb4e484f1aeaa78e29f5c5c31282fae21c",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-019.html": [
+         "46bb1bf810a5894263e631038c040a3186123f5c",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-020.html": [
+         "127c80a95925edffa2a479199ebafc6d021e1635",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-021.html": [
+         "7698d4ea32291489dfae63718149baa3c8309226",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-022.html": [
+         "2d8a7e1a63d538f5e9af00209e7682fc1362266a",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-023.html": [
+         "452d1de0f87433ac2a7cfcf56083378be3ba75a9",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-024.html": [
+         "97e4dfa1aac07b774665b0b6fd9f95c6c117b886",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-025.html": [
+         "318e8cf22a9c7338f9bf543740cc1e91258a8662",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "shape-outside-polygon-032.html": [
+         "fc1e2edac6ad3879a88c1c8089f52ad15c4b07d3",
+         [
+          null,
+          [
+           [
+            "/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
         ]
        }
       },
@@ -168003,6 +170060,32 @@
         {}
        ]
       ],
+      "block-aspect-ratio-with-margin-collapsing-001.tentative.html": [
+       "78a0418fe285da58030cdd863460add0533e6af5",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-aspect-ratio-with-margin-collapsing-002.tentative.html": [
+       "111a6049e5aa3c1ca87e22d3505809a9e5a91696",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "flex-aspect-ratio-001.tentative.html": [
        "3b477e299ad763a1c0108e16f05981c76c25bb77",
        [
@@ -168133,6 +170216,58 @@
         {}
        ]
       ],
+      "flex-aspect-ratio-011.tentative.html": [
+       "2c111477e51758aad7e218385e8ee5aa2752ef0b",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-aspect-ratio-012.tentative.html": [
+       "187da3b4262ed5958dd55ee7a4ae8cb2f7f773d8",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-aspect-ratio-013.tentative.html": [
+       "04933e9b10155ae022aedc2e92b038dd97f23819",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-aspect-ratio-014.tentative.html": [
+       "13d1719bf2e732b979725dcf6c31fcef91b75b2d",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "intrinsic-size-001.tentative.html": [
        "5b2c6049bd935c928f29c50bf4ad7afae41c4576",
        [
@@ -168470,6 +170605,97 @@
         ],
         {}
        ]
+      ],
+      "replaced-element-015.tentative.html": [
+       "ee579ea7e9f87c93198213424032ca2f475f572d",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-016.tentative.html": [
+       "0ed8330424af0f33bd72494ffe975c8d49a044ca",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-017.tentative.html": [
+       "4947a702d0a8d4ffd8891bbc1f370ccac915a1dd",
+       [
+        null,
+        [
+         [
+          "/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-018.tentative.html": [
+       "f26c1f60a88c9d38b78316f7edc2f5188702e456",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-019.tentative.html": [
+       "80ff2ccd49cd1f38f56b8129cfc645bf02fdf57b",
+       [
+        null,
+        [
+         [
+          "/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-020.tentative.html": [
+       "b2d58ea3d246ec31a27e93343716172e9b928f3a",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-element-021.tentative.html": [
+       "14a2b8eb6d491cec289708e993b9443d3db94cf6",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "auto-scrollbar-inside-stf-abspos.html": [
@@ -169713,6 +171939,71 @@
        {}
       ]
      ],
+     "absolute-tables-008.tentative.html": [
+      "157139b9ca0ca9aaa88c3afc2d2f068054f21243",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "absolute-tables-009.tentative.html": [
+      "291c69afbcf06aa15107b073a18085c357df166f",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "absolute-tables-010.tentative.html": [
+      "cb4ad48f3ac69097eccf780f058dccf706b1478c",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "absolute-tables-011.tentative.html": [
+      "5c8ed3a5fa897faa509731ec6363642280d803b8",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "absolute-tables-012.html": [
+      "76dc0bf9e88c3de54c89bcd4bc8532b36eb38d93",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "anonymous-table-cell-margin-collapsing.html": [
       "23b467ebacc983122a632f4d5971c8daca569420",
       [
@@ -176050,6 +178341,32 @@
         {}
        ]
       ],
+      "tab-size-inline-001.html": [
+       "ecdcfeff010c1fdbb0c845e5f1c2e5eeb5e1667d",
+       [
+        null,
+        [
+         [
+          "/css/css-text/tab-size/tab-size-inline-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "tab-size-inline-002.html": [
+       "f87c107949a4da4b4c64710c5c476090833f9b43",
+       [
+        null,
+        [
+         [
+          "/css/css-text/tab-size/tab-size-inline-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "tab-size-integer-001.html": [
        "410df6fceb33df66973beff4ea0398ead97de3b4",
        [
@@ -176089,6 +178406,19 @@
         {}
        ]
       ],
+      "tab-size-integer-004.html": [
+       "70dc7bf6f8ac4a1a675923a53c477601e4bd7834",
+       [
+        null,
+        [
+         [
+          "/css/css-text/tab-size/tab-size-integer-004-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "tab-size-length-001.html": [
        "2e466da025959ae1e82d773240116aa87a7e51fe",
        [
@@ -179913,7 +182243,7 @@
        ]
       ],
       "eol-spaces-bidi-001.html": [
-       "976ce7c639f10d2137da1492f50ea74c769c1091",
+       "b8bcbe17b738d40e4facffc0285282fe20002d30",
        [
         null,
         [
@@ -179925,6 +182255,19 @@
         {}
        ]
       ],
+      "eol-spaces-bidi-002.html": [
+       "0efba0a363fc8353775263928223773a9d10e3b4",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "line-edge-white-space-collapse-001.html": [
        "4e144e6c330191435f183936c2ab2437ec4f7609",
        [
@@ -180934,6 +183277,45 @@
         {}
        ]
       ],
+      "trailing-ogham-001.html": [
+       "f687c7cdc377679a3eeb392254e6f68c883c504f",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ogham-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ogham-002.html": [
+       "7bf17750783d98e26b344b43caef21ce010ccd45",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ogham-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "trailing-ogham-003.html": [
+       "597feba3096d164b1bd415aa6c7879318baa4436",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/trailing-ogham-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "trailing-other-space-separators-001.html": [
        "ce5740bd0ed3dc12d0f584048bb150de48835263",
        [
@@ -194856,31 +197238,18 @@
       ]
      ],
      "appearance-button-001.html": [
-      "33fccb5806541d12c9b570489a67d6cd9f3169c9",
+      "317f56b18ae7109962340f3364d06d7116f97077",
       [
        null,
        [
         [
-         "/css/css-ui/appearance-button-001-ref.html",
+         "/css/css-ui/appearance-auto-ref.html",
          "=="
         ]
        ],
        {}
       ]
      ],
-     "appearance-button-002.tentative.html": [
-      "5c9e9a280acaf0d8c871ddc75f57963da233ee76",
-      [
-       null,
-       [
-        [
-         "/css/css-ui/appearance-button-002.tentative-ref.html",
-         "!="
-        ]
-       ],
-       {}
-      ]
-     ],
      "appearance-checkbox-001.html": [
       "54ebef94f24cd207f1e7a3f40f45cc825698df1c",
       [
@@ -196272,27 +198641,27 @@
        {}
       ]
      ],
-     "webkit-appearance-button-001.html": [
-      "c71a914723b36819e6918ca9f0358aaf98e85772",
+     "webkit-appearance-auto-input-non-widget-001.html": [
+      "5f5ddde393f48c43cb054a63450891e5ab43d026",
       [
        null,
        [
         [
-         "/css/css-ui/appearance-button-001-ref.html",
+         "/css/css-ui/appearance-auto-input-non-widget-001-ref.html",
          "=="
         ]
        ],
        {}
       ]
      ],
-     "webkit-appearance-button-002.tentative.html": [
-      "4c322fa20e4af9f3f06fcf2b9a3782add378ec38",
+     "webkit-appearance-button-001.html": [
+      "cf36b42384a7168d85a0475bded03aaadf26d52c",
       [
        null,
        [
         [
-         "/css/css-ui/appearance-button-002.tentative-ref.html",
-         "!="
+         "/css/css-ui/appearance-auto-ref.html",
+         "=="
         ]
        ],
        {}
@@ -196389,6 +198758,19 @@
        {}
       ]
      ],
+     "webkit-appearance-progress-bar-002.html": [
+      "5394836b756d18d0c2e5ff89e595d25d447f4679",
+      [
+       null,
+       [
+        [
+         "/css/css-ui/appearance-progress-bar-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "webkit-appearance-push-button-001.html": [
       "6f44498d4660f58e6df2b32efd218c729edc0fc8",
       [
@@ -197814,6 +200196,19 @@
        {}
       ]
      ],
+     "will-change-stacking-context-003.html": [
+      "b764d2e86d641d514751afa664672291c3acf0b1",
+      [
+       null,
+       [
+        [
+         "/css/css-will-change/will-change-stacking-context-003-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "will-change-transform-image.html": [
       "edce6c1f9bfa840004d8e82e6720be9c18bd23b6",
       [
@@ -211413,6 +213808,19 @@
        {}
       ]
      ],
+     "backdrop-filter-svg-foreignObject.html": [
+      "4ccaa0cf81ff6c9787ad02c53cf6a1d19857dace",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/backdrop-filter-basic-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "backdrop-filter-update.html": [
       "de629a1fb2f85b1be4e2c4dd8bf53200b5295dc0",
       [
@@ -226861,1282 +229269,6 @@
          ]
         ]
        },
-       "shapes1": {
-        "float-retry-push-circle.html": [
-         "a079d71adbd34d0eebaf2076dfb3077711617462",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "float-retry-push-image.html": [
-         "c88beb38d68432c7e00b611cd70f0f717a7faef9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "float-retry-push-inset.html": [
-         "9410ebd3c6b68021fc861a41a540b79e9c9d89f6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "float-retry-push-polygon.html": [
-         "f7385f76cab4b0d5ec133cf0d1959380429034cc",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "float-should-push.html": [
-         "c6bcfe576b6227257219753b86cacf41b8974992",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-should-push-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-001.html": [
-         "86887baff0f7b9b38f674e4c1f7222e04b14f63f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-002.html": [
-         "f47219e82ec915bb7c6448dd733f73f908e9b9f6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-001.html": [
-         "136bc10d205f4ed8c8f74c2a7c91e9dca07a6006",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-002.html": [
-         "ee48b439ae6c7ed7528a7556c4724f9829714c76",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-003.html": [
-         "2b5375890967f720d948e81d81a73bf9b011d909",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-004.html": [
-         "1a3c72c5d02712f7e34b28249f6aecffd3c678fa",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-005.html": [
-         "2c6acebe58c7f17ddc86b9857fdfa6e814f8529b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-006.html": [
-         "4f8742ceba37ef3e5240c1edfc1a250505f58af4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-007.html": [
-         "1a90a08c5fddf484ebb0cf4ff194c33dc6d59a3c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-008.html": [
-         "59b25c4b61073be02bf77f98a401513292d243ba",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-009.html": [
-         "9d2a8092c6bafc6a68a053924091e657db2a5ea4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-010.html": [
-         "280c7e2b6ff82e0047e370f2dad2cffe63ee66b6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-011.html": [
-         "34f4c69e69d1e4201b6f9ecfa88918862c9a9cd6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-border-box-border-radius-012.html": [
-         "7bf8efe9309f34c6012a8c3a74a685313ba2e7d8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-032.html": [
-         "d6cadf81d5f68b50ac17e4dc7a7426aaf6465b8c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-033.html": [
-         "8ce9557a681d98a9291102cbd6541be9a8ae7cc4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-034.html": [
-         "2f8a485a259c6370cd84c3706daaa9ac6601219d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-035.html": [
-         "7608bce23f5b9c6c889b58425ff2229e5925650d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-036.html": [
-         "0c558719d4f2303b9621cd34f0358e90d9ef7d29",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-037.html": [
-         "67446b6104c28e631f070d9c8361545f4c01184b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-038.html": [
-         "979650c102cebf445278506220926b20ce75befd",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-041.html": [
-         "b120bfcc46f2d25f0ba81674df70bae384e1e0ec",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-042.html": [
-         "3748d1d476f3744e2ae8e864c7028255aaaa19f8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-043.html": [
-         "200f59ce49099969f0ac804f38a61443b2aa1fd1",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-044.html": [
-         "f07985b3d63eb4e330538c3b57588984ddc1c76c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-047.html": [
-         "450748a098f10af502c22cfe8420f075db3274b6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-048.html": [
-         "40cdc8f01167263041ba0c0bcd313768d2bff38b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-049.html": [
-         "150a0e0581f70ba6a172b1e405e646679afa5dbb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-050.html": [
-         "0a4076211c4b72258b04dabd3e425ab0f10134c3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-051.html": [
-         "02290fb8860057dfef66b6ff605fdc4a94b4afdf",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-052.html": [
-         "eea3695fd9162a0f30a32246801ee87bef4dd9b7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-053.html": [
-         "3732605bb982d2f388aa5fa7e2967000fb269bdb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-054.html": [
-         "fd85c795dd52ac0fc8b8eeb1e73e36e04995278f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-055.html": [
-         "8280c0e8bb0f2a0b6f9b50453e8927746cb631b4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-circle-056.html": [
-         "d51cb50447ee5681459569fbd4fd573fbd2f2ccf",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-content-box-001.html": [
-         "d046de02d3c6f016f85eed5552774f1fbe3cefa2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-content-box-002.html": [
-         "e2040763dfbffe411d09ab5c5fbfdbcb37bb789c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-content-box-border-radius-001.html": [
-         "be5591ec6ac11446e9d6993e7417ab2e269d3f81",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-content-box-border-radius-002.html": [
-         "70c8bc9e2efc3d0c3f75ad53fbe480b096779c71",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-032.html": [
-         "d0c92b9df0bd254f30742eee3bf95a8829b006d2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-033.html": [
-         "2e2fa577b22d4bde870f89d4310516e9d9b1848b",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-034.html": [
-         "fb4d1331e69fba448e0098c32715397a38baf57e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-035.html": [
-         "bc3814a244a133e55f19ea33962ce36daec1c467",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-036.html": [
-         "9a14e65ba25c31c9b818adba0f762c51f604a5f3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-037.html": [
-         "6015d2de0dd551083e53b2047445211618b06bd8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-038.html": [
-         "2d16fae743a954de7a915cb41ddd7ad5b0245fb0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-039.html": [
-         "ca5078533900a3a415a9e818997d4a63e81099b7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-040.html": [
-         "a5b0ce730cb45a7019c69d126630077793217cb9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-041.html": [
-         "2050e502dfacde8d82b528beb42c6063dcfdaac3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-042.html": [
-         "5febab8939150b5d1e8b37b340106df459ba6c72",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-043.html": [
-         "4920dc040d7ee0d258773ca8d106de78fe0dfae4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-044.html": [
-         "0590b13203260a7708fcfa2f7a5f62db979ddee8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-045.html": [
-         "89c786f1abbdfd4b09cb58892dee9c8b11df1d38",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-046.html": [
-         "98885fb49b5c7cc6939bf65c061fc6163903b4b5",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-047.html": [
-         "48f49a25aa06e0061316ebd02d1aa2d2c5c9daf2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-048.html": [
-         "f1b36447b064ae19121ddc9b602e6fb39ac023f9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-049.html": [
-         "5a5919aa663907083aa8bbae915b66d600cbfbb9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-050.html": [
-         "698cf2d40b67852a0d2cef633f5d0494e7dcdb77",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-051.html": [
-         "b3bf1b960ebeca9eebe7ecce284bd3a698e81c6a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-ellipse-052.html": [
-         "33f7a8fe34fdcd671c96e307d7ee753003f1a2b5",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-016.html": [
-         "95b5eff0f762bf0fbdff54ccc8e8f5c0253135f2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-017.html": [
-         "e936b709cec22d56b870db30b7a673464293b779",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-020.html": [
-         "786da6c395965b8570a5e74adf56fe5928cd831d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-021.html": [
-         "96b5602f26572e50ac41f7b545df1f1c7f552d67",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-022.html": [
-         "762b53b9e69c659c227995d78214f6f0558a6f4c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-023.html": [
-         "5ab5a069dc290afc6eebe6d43fa5966afad8450c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-024.html": [
-         "6dd122c4b61906a57f5d0b42dd3491c011148de5",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-025.html": [
-         "7b015c33724d8e5fc5bae8dd836dab2f6404a2cb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-026.html": [
-         "4beec3f0bd96bdd2c0ad219e1e3eeba19023c35d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-inset-027.html": [
-         "3d8d0f5c07e71790c663eb40e7342edf629e80ff",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-001.html": [
-         "3c0b0fbd6d1cb857c94d25d3c82bf614918d1128",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-002.html": [
-         "e8b71d126c25c2a7870ac759129eb3b90ec8daa9",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-001.html": [
-         "dcd261519271949691ef95eb9a042dcfdb84f7d6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-002.html": [
-         "a49184aa5967f8ba3c1b5b4ef88860b5a7442d8f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-003.html": [
-         "450fe76fc5dde997157dbdb37dc49efcb02c30a3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-004.html": [
-         "d4d131bc9e09e2b1dc98bcfc9ffddf715bccb7ff",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-005.html": [
-         "733659c75569ccb75aa19bddb7d3d40bd3e1800f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-006.html": [
-         "383c0524e9a815da0b43b6d08a89d5e4b7f5c7bb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-007.html": [
-         "95fc114cd70333119cd9398ec7463a4985f2b57c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-margin-box-border-radius-008.html": [
-         "a520c1cb2efb0c7dc16c97c1f2788f3609095a2e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-padding-box-001.html": [
-         "ff7d15abe8b7d8b57f8d0533ea201644bd612b83",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-padding-box-002.html": [
-         "4f0d1feea75d3d9c6b5e874eb4e09e5bf52aadce",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-padding-box-border-radius-001.html": [
-         "1b02259de4faf92f03dbe4925c227e5cc53dd9b2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-padding-box-border-radius-002.html": [
-         "59f9400fdc13d2cefbfb01bd0d0b87dce2568e0a",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-018.html": [
-         "b3f6397397508d731bda3bee7dde7c16fc4ed0e6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-019.html": [
-         "af2d0c10a5d423a0d3b5ea10a1cd5239b1b0f5ef",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-020.html": [
-         "2973cd48c7adf9501d3de7eddb6027d9102a01b6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-021.html": [
-         "ecc7c878ec25f69940aa09a5dbbe8edae7560ab3",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-022.html": [
-         "331fe177cd17ae39582a5b3f852253fe416f932d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-023.html": [
-         "1564ccd6b365b2b0f7a80bfeeccce665b0eafb85",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-024.html": [
-         "672908068872a247a3a980e0f6575bd1b89e9e63",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-025.html": [
-         "35db9799b90c6917205d818bb54890c4ed895757",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "shape-outside-polygon-032.html": [
-         "6e17492e4496fbd33ec42486f737ba204c343fcf",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ]
-       },
        "sizing": {
         "block-size-with-min-or-max-content-1a.html": [
          "74314e525691f9d913cbf35f174725dc5c998f53",
@@ -228256,12 +229388,12 @@
          ]
         ],
         "vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html": [
-         "32826ee1654ce840ce630fb2a5779e23889e01c8",
+         "4167c674870b1c9bdd418ced3629857cc9a4776e",
          [
           null,
           [
            [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html",
+            "/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html",
             "=="
            ]
           ],
@@ -234355,6 +235487,19 @@
        ],
        {}
       ]
+     ],
+     "forced-colors-mode-backplate-11.html": [
+      "b81b52282e95377c6a5ccbf1c540c880953c7b9a",
+      [
+       null,
+       [
+        [
+         "/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "forced-colors-mode-01.html": [
@@ -234423,7 +235568,7 @@
      ]
     ],
     "forced-colors-mode-08.html": [
-     "8c87576bee23abec7a6f50dd78379efe9f1b2d36",
+     "a8819743fe99666b6753ded0fb73956e0bdc0af1",
      [
       null,
       [
@@ -234449,7 +235594,7 @@
      ]
     ],
     "forced-colors-mode-17.html": [
-     "fbdc9da0b42eec84f42013837ed61f2ee57ad903",
+     "97dd36938550d21b3417a1b66c148c51e9b15244",
      [
       null,
       [
@@ -234527,7 +235672,7 @@
      ]
     ],
     "forced-colors-mode-28.html": [
-     "4e00c65357f84cd0206baba679469f25f9055c75",
+     "7e2dfefadc419689544f46c33eeef85b44c6cfbe",
      [
       null,
       [
@@ -234538,6 +235683,136 @@
       ],
       {}
      ]
+    ],
+    "forced-colors-mode-29.html": [
+     "794cca771f45df5cb5457659ee5633978ba2d5a0",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-29-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-30.html": [
+     "2f2a5e2e1276e67b00e1b6d9858d5a4f1ded4212",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-30-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-31.html": [
+     "ba338c1e0cc8eb56acc578265b4c220c830bdca5",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-31-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-33.html": [
+     "17299efa2b95057e3b2b72d57c442edfe10b3998",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-33-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-34.html": [
+     "f4ec066e30fa9c742b26572f6cd1e07a0ae02d6d",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-34-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-35.html": [
+     "098a9ce9d339260af059354235874123831683af",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-35-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-36.html": [
+     "0fd90810dce2a0b16938f2fbeb39b9d18d721db7",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-36-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-37.html": [
+     "80e06ed8703f85c6a8d69f5631116aa7c9b1ba1f",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-37-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-38.html": [
+     "3179aaf4b99344d85ab5d6f3d46bee7f119a4b1d",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-38-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "forced-colors-mode-39.html": [
+     "7b69fc979c2627472288081e522d774b98b27071",
+     [
+      null,
+      [
+       [
+        "/forced-colors-mode/forced-colors-mode-39-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
     ]
    },
    "html": {
@@ -238706,6 +239981,19 @@
          {}
         ]
        ],
+       "image-compositing-large-scale-change.html": [
+        "07c53cb23445e6fe642a52093b66796c5101224d",
+        [
+         null,
+         [
+          [
+           "/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "image-loading-lazy-slow-aspect-ratio.html": [
         "2d302970cab98fa13cd5653c025003286efb7b29",
         [
@@ -238883,19 +240171,6 @@
      },
      "forms": {
       "the-input-element": {
-       "defaultValue-clobbering.html": [
-        "c65f6ff88c7424de4c44670a85ec9d4204aabb99",
-        [
-         null,
-         [
-          [
-           "/html/semantics/forms/the-input-element/defaultValue-clobbering-ref.html",
-           "=="
-          ]
-         ],
-         {}
-        ]
-       ],
        "image01.html": [
         "e9028dceec736da67b8c8814cb103cfecbc518a0",
         [
@@ -239127,6 +240402,32 @@
          {}
         ]
        ],
+       "grouping-li-reftest-004.html": [
+        "2a7647fc2ada3d41e910d9614258eaeb8408dd2c",
+        [
+         null,
+         [
+          [
+           "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "grouping-li-reftest-005.html": [
+        "2fa4e5dbe341b44a3da21514c161ffd0c3b05afd",
+        [
+         null,
+         [
+          [
+           "/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
        "grouping-li-reftest-display-list-item.html": [
         "ce63cf7c7c043ef80b53a7c1beaade4a15d4a2b0",
         [
@@ -241336,6 +242637,32 @@
         {}
        ]
       ],
+      "mo-not-in-dictionary-lspace-rspace.html": [
+       "3437450dfb27af5f4e3f076e405c96fbff3e5b61",
+       [
+        null,
+        [
+         [
+          "/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "mo-not-in-dictionary-movablelimits.html": [
+       "e50f118f8fd04da5d70bedd1a8876c5eac3131d7",
+       [
+        null,
+        [
+         [
+          "/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "mo-paint-lspace-rspace.html": [
        "0c387f5656505cdb74a35cc97358895cbda17e07",
        [
@@ -242645,7 +243972,7 @@
      ]
     ],
     "layout-changes-on-percentage-based-timeline.html": [
-     "4884715255c06f03fdcf7e8162c0c2d60754c5f3",
+     "19fce37213386416283754221486e7311f709ef0",
      [
       null,
       [
@@ -248624,7 +249951,7 @@
   },
   "support": {
    ".azure-pipelines.yml": [
-    "fbdef35656e149a16e00a71964f4aad1d6be2196",
+    "882b63058dc911885ad5652012313bc5236d2680",
     []
    ],
    ".codecov.yml": [
@@ -248660,6 +249987,10 @@
      "pull_request_previews.yml": [
       "bf049dd9e63b0a8901bbf693a42fab2dfb621305",
       []
+     ],
+     "regen_certs.yml": [
+      "a2f5834bfc94235a3e9157483f19ee41c5f2cccb",
+      []
      ]
     }
    },
@@ -251496,7 +252827,7 @@
       []
      ],
      "bluetooth-test.js": [
-      "01cabe89bb6ac83b1025e386e4e02d9a04ba62cf",
+      "dd385689cb950d2300f9e934bf8715451ab25720",
       []
      ],
      "health-thermometer-iframe.html": [
@@ -252139,7 +253470,7 @@
        []
       ],
       "svg.py": [
-       "4f29e4639ecdd5ab0dd9b6cb5e05edfbb58b556d",
+       "9f965ae98d22cf7e951dbd4045b34570ccf8cbe7",
        []
       ],
       "template": {
@@ -252247,7 +253578,7 @@
      []
     ],
     "stringifiers.js": [
-     "4ef7a1bfedaba1835bb44cca9207e0748ba83522",
+     "18de6c8c5b32c5e14fb8c0fc24d3b8564a451acf",
      []
     ],
     "stringifiers.js.headers": [
@@ -270510,7 +271841,7 @@
    "contacts": {
     "resources": {
      "helpers.js": [
-      "88b2f1656ee7203a6f88ba2c747e2ba192a8335e",
+      "c67d684652884c99dce7c29c6121952941743641",
       []
      ],
      "non-main-frame-select.html": [
@@ -271770,7 +273101,7 @@
       []
      ],
      "helper_iframe.sub.html": [
-      "8e91cb7bed48c44a7b5e0cbe98bd3c198b372269",
+      "9017eace44d84112c4e21c35cb6724efa69b1366",
       []
      ],
      "helpers.js": [
@@ -283609,7 +284940,7 @@
        []
       ],
       "bottom-offset-001-ref.xht": [
-       "587b8441fa3c0b7771a8033cc29138efbd319db8",
+       "c67c2bc4d83817054b5ca7b2a1a4b3bba486ff33",
        []
       ],
       "bottom-offset-percentage-001-ref.xht": [
@@ -291676,7 +293007,7 @@
         []
        ],
        "mix-blend-mode-svg-rectangle-ref.html": [
-        "6d74ee05211bedabbd0957d431dce86f27f14f33",
+        "94e73b57c9797d2aa270fb4b82ab8035510b8824",
         []
        ]
       },
@@ -292371,6 +293702,10 @@
       "cdeaf1c8e81f0d6854b617d286e681647abe217a",
       []
      ],
+     "border-radius-012-ref.html": [
+      "75f7985aa4a9361078c05429b7975c3bf81c77cf",
+      []
+     ],
      "border-radius-dynamic-from-no-radius-ref.html": [
       "e0ab6ce4414b107b4ca6a3fce8d6f5976d9bd7db",
       []
@@ -292610,6 +293945,10 @@
        "99dd2f0beb2a6a9b5bcf79408d1fbf089b8e15ec",
        []
       ],
+      "border-width-small-values-001-ref.html": [
+       "26177acb379017189f4deceb5519217fd97d2c51",
+       []
+      ],
       "box-shadow-005-ref.html": [
        "81a5cbf6b8e06f6435bc133287f128ed6af8ed62",
        []
@@ -292695,11 +294034,11 @@
        []
       ],
       "css3-border-image-repeat-repeat-ref.html": [
-       "64490d2e5ce99601e9ca38eccf2944509519d496",
+       "58d48f007502c1d149dccb8efb94f47f067d8208",
        []
       ],
       "css3-border-image-repeat-stretch-ref.html": [
-       "cdbffd153b2d71e5fa4f4a095ff6f0f42ef0ca8c",
+       "ed83c3dbf279aadc94da3df5d767fe453f8ce39c",
        []
       ],
       "css3-border-image-source-ref.html": [
@@ -292714,6 +294053,10 @@
        "21a22bd273688115b3916691b4c4557f30d063d8",
        []
       ],
+      "inline-background-rtl-001-ref.html": [
+       "fe2ac8bdb1994fe6bd36ba85d7c71f49b7d7cf89",
+       []
+      ],
       "ref-filled-black-96px-square.xht": [
        "7309746e54f73c9d0f978d1986b6df40e950793b",
        []
@@ -292854,6 +294197,10 @@
        "5b2f7e156ce34b51379b7a72e65d912ed0066171",
        []
       ],
+      "blue-diamond-27x27.png": [
+       "1e66726482551231aba9e44557752fd483afa0cd",
+       []
+      ],
       "blue-diamond.png": [
        "3617045efbc0ab9702af523f4999cf45247db38b",
        []
@@ -292938,6 +294285,10 @@
        "9945ef47114c2841a746c99a2fb1e93e050aac8b",
        []
       ],
+      "new-red-diamond-27x27.png": [
+       "859cbc33d216aa454ede2702b1c6ac7f39e6ca02",
+       []
+      ],
       "orange_color.png": [
        "329491802f2fccfa565491fc316e0f06e0a849e3",
        []
@@ -293115,10 +294466,58 @@
       "46e6927a29302057e01a01845f3edd644f7c4bff",
       []
      ],
+     "borders-000-ref.html": [
+      "a7022ae575c3cca04400ef2b4011a8e800bf668f",
+      []
+     ],
+     "borders-001-ref.html": [
+      "30c472f93782e7d6c664560f156e02d01d239f36",
+      []
+     ],
+     "borders-002-ref.html": [
+      "7abcf4ed61c83cd251e2d8e63b1fcbaf6f0ccdba",
+      []
+     ],
+     "borders-003-ref.html": [
+      "d8a576ea6fab02667215065e497052a8282e1090",
+      []
+     ],
+     "borders-004-ref.html": [
+      "8cbbf0ccc459a315f0d8a0ba3a4e4e0ed4534bc9",
+      []
+     ],
+     "borders-005-ref.html": [
+      "20a0431510af91fb53b4f026c384a2eb270686bb",
+      []
+     ],
+     "borders-006-ref.html": [
+      "292c0f9c9b63bad4ce70cc85074df30300e63b33",
+      []
+     ],
+     "borders-007-ref.html": [
+      "3b9e23678d4eb08387423de7a0a0dfb5675445ef",
+      []
+     ],
+     "break-nested-float-in-table-001-print-ref.html": [
+      "3459e25edd64ca8d90cebd4a44f68aa9b4106e25",
+      []
+     ],
      "fieldset-001-ref.html": [
       "1422086da71c3e62bde10d499a7a0de220737f3f",
       []
      ],
+     "fieldset-002-ref.html": [
+      "be5e1b0e7c2d5c0d4d85d161d83cd3a12c485a32",
+      []
+     ],
+     "fieldset-003-ref.html": [
+      "e8b323dff222aba6d70ee3c51b3e42996fc5ab89",
+      []
+     ],
+     "fieldset-004-ref.html": [
+      "5c96f31a6ba193f6d86c7a66267581edd65260d2",
+      []
+     ],
      "floats-and-text-narrow-and-short-dynamic-ref.html": [
       "51855d2d7a724d44f44c1585708851fd62242fbe",
       []
@@ -293140,7 +294539,7 @@
       []
      ],
      "all-prop-001-ref.html": [
-      "ce41e502b7479e6e28bf9d4b23c57c1dde1e56ae",
+      "e25558578344f0725d752e35fcc35e2db683eb2c",
       []
      ],
      "all-prop-initial-visited-ref.html": [
@@ -293164,6 +294563,16 @@
        "8183c04087037c66bb33def60bae0ea79ec964df",
        []
       ]
+     },
+     "support": {
+      "test-green.css": [
+       "da8e1014d2a95eb3300124b8d6b7c2baa04b8fcd",
+       []
+      ],
+      "test-red.css": [
+       "bb309fcd5702313081fda45be87ab159b00b6f7c",
+       []
+      ]
      }
     },
     "css-color": {
@@ -294444,7 +295853,7 @@
       []
      ],
      "break-nested-float-in-flex-item-print-ref.html": [
-      "e867430bc63e3420004af5d377a1cc1edc4e75a8",
+      "d4a678d0746e87768b6a5be24a66b5f79e35a116",
       []
      ],
      "css-flexbox-column-ref.html": [
@@ -295843,6 +297252,14 @@
       "fdb477fe168c17d21f5eecaf4d6a7aa6de4581ae",
       []
      ],
+     "downloadable-font-in-iframe-print-ref.html": [
+      "f66046f8a28e4662a0ad5eb715e969df600d371f",
+      []
+     ],
+     "downloadable-font-print-ref.html": [
+      "28a92a86dcaf6bc9c45bb75fce4869bc0ae21c37",
+      []
+     ],
      "first-available-font-001-ref.html": [
       "0acbd338e0ce9f558d2eaa2e48ad4be0524fb0ae",
       []
@@ -296391,6 +297808,16 @@
       "70e2d50cd83f61017f0f22da14065c7afa76e1d1",
       []
      ],
+     "resources": {
+      "markA.ttf": [
+       "353e7ac3328297b91844430dbd6d93ad9d25779f",
+       []
+      ],
+      "markB.ttf": [
+       "c683ddf945d8d9161442a7444f40178d6502f94a",
+       []
+      ]
+     },
      "standard-font-family-10-notref.html": [
       "e977fdaf7647400d18b975247d42b239a37e540c",
       []
@@ -303075,6 +304502,10 @@
         "59a0e339598b4c6e0f9b604636c9199826c45f2d",
         []
        ],
+       "grid-self-baseline-008-ref.html": [
+        "7876656c2080bb36b0286783ac75f5b8ef2f831f",
+        []
+       ],
        "grid-self-baseline-horiz-001-ref.html": [
         "1b8130d7b89ae35111009318535320e05bbda766",
         []
@@ -303905,6 +305336,10 @@
         "a3e2ece6e7c26d79d1198c2abecc8d99bf23e1f5",
         []
        ],
+       "image-orientation-background-position-ref.html": [
+        "a19e535dabcec2f24b7cc16e2aa7ae92ccfc99d9",
+        []
+       ],
        "image-orientation-background-properties-ref.html": [
         "0d2aabc4d00d057b1fca18597602847d04513943",
         []
@@ -304559,6 +305994,14 @@
       "3d1b67228fb65c34a861c1c682f0e29583cbdfd9",
       []
      ],
+     "counter-list-item-2-ref.html": [
+      "9405c845ce7e7290c64c7e4706c0d6d9d8f95276",
+      []
+     ],
+     "counter-list-item-3-ref.html": [
+      "926d8df504e9795a19b552e39d68dd1d923494d0",
+      []
+     ],
      "counter-list-item-ref.html": [
       "04ed6e87fad005537714d8c24a9eff5747c4943e",
       []
@@ -304758,6 +306201,10 @@
        "ed78cb7338c8dc9f24afb04870e3fbb1fb1c107e",
        []
       ],
+      "clip-no-stacking-context-ref.html": [
+       "056af2237582de99ccc5989111cfd65219f35baa",
+       []
+      ],
       "reference": {
        "clip-absolute-positioned-ref.html": [
         "2a9a49fd3ab9bdef973bd09f919deb73808abafd",
@@ -304814,6 +306261,10 @@
        "b860304f04fe22498eb5b43d9de00d7e261353bb",
        []
       ],
+      "clip-path-rotated-will-change-transform-ref.html": [
+       "ddbf0e9812cf432486f22a22cb2680343d5be298",
+       []
+      ],
       "clip-path-svg-invalidate-ref.html": [
        "20c8085b948f7ce9f3268b1f3cfb653673e335e9",
        []
@@ -306047,6 +307498,22 @@
       "9ccdbf93c615f6078b82add5362e6032e9efe583",
       []
      ],
+     "clip-002-ref.html": [
+      "19c901981d7f0be91076d39306d7b6566ca66430",
+      []
+     ],
+     "clip-003-ref.html": [
+      "5de31068e2e9892424bb1200bbb6afdec5c0fd70",
+      []
+     ],
+     "clip-004-ref.html": [
+      "39e12445d407e8d2cebc92f36fa352fac5a7b64b",
+      []
+     ],
+     "clip-005-ref.html": [
+      "09081e25039a2a07c6dd798fc68ff7b8a07bc333",
+      []
+     ],
      "overflow-body-propagation-007-ref.html": [
       "66f9b1c3b0098c0cc448775cde0d94b4325a94a8",
       []
@@ -306617,6 +308084,10 @@
       "4f8d043e5a3f108b0ce26f335ddbc405c047ac17",
       []
      ],
+     "position-absolute-large-negative-inset-ref.html": [
+      "e04afce6ebd42889a3937823e86fcfd7b92da433",
+      []
+     ],
      "position-absolute-root-element-ref.html": [
       "d4649f2d5abc240f09551cc9efebfa2029406101",
       []
@@ -306625,6 +308096,10 @@
       "96dfe200fb0dbae31906305e1536cf32f4d96c09",
       []
      ],
+     "position-fixed-scroll-nested-fixed-ref.html": [
+      "024bf032d770c4c2a47b14715c279557dfaefefc",
+      []
+     ],
      "position-relative-table-left-ref.html": [
       "7c1193b80007d8e7f89b35400a6d2ea2266cb3ac",
       []
@@ -306829,7 +308304,7 @@
       "7cca053e681993aa71f14738c76d4f66d8e235ad",
       []
      ],
-     "file-chooser-button-001-notref.html": [
+     "file-selector-button-001-notref.html": [
       "e137ba05103d71203dc09083fa71fbbed1b21617",
       []
      ],
@@ -307037,10 +308512,18 @@
       "1342b0621fc637b287fd7d9268af3ee2c5348962",
       []
      ],
+     "marker-content-023-ref.html": [
+      "d0ce5c1fad714a65b67e6d0f7bf652bc644537d1",
+      []
+     ],
      "marker-font-properties-ref.html": [
       "a8fb980ff09cf8e326e6728976ac6dd8230866f3",
       []
      ],
+     "marker-hyphens-ref.html": [
+      "3f29ce441ff36ab04f01dd7d867b1ff486d63963",
+      []
+     ],
      "marker-inherit-line-height-ref.html": [
       "9bd8ca874a02bb4f9e87eeb347525e5ec6673ac2",
       []
@@ -307053,6 +308536,18 @@
       "bfae577499c5614d37ac3dc6ba695dbdf4457538",
       []
      ],
+     "marker-letter-spacing-ref-001.html": [
+      "e5f4aedfba7844fc5c95c7cb7beb9fb7c22caab1",
+      []
+     ],
+     "marker-letter-spacing-ref-002.html": [
+      "b4022699063aca5049d94c17e6520aaab3799112",
+      []
+     ],
+     "marker-line-break-ref.html": [
+      "75625c1ea2895d27baf9ca8afa9f7d32a91f2d14",
+      []
+     ],
      "marker-list-style-position-ref-001.html": [
       "2593194d298fe3ee8bb14ffe9923a654a19d5c8a",
       []
@@ -307061,10 +308556,30 @@
       "1c21789c079d3b97f7fc8628d6918453cbd04669",
       []
      ],
+     "marker-tab-size-ref.html": [
+      "2985ac2eeba46348f51eb3c5a9717ab8e38edd83",
+      []
+     ],
+     "marker-text-align-ref.html": [
+      "2355fab2e7e1398d61c239187201504480ec08a6",
+      []
+     ],
      "marker-text-combine-upright-ref.html": [
       "2ad96e37bb145b4bae9aae37db8b23df7ddfdc3b",
       []
      ],
+     "marker-text-decoration-skip-ink-ref.html": [
+      "9bf2cf2f50be8309229127df0ad321d00e5fdac7",
+      []
+     ],
+     "marker-text-emphasis-ref.html": [
+      "aad3614c693381312a3636bb7a5cbcc40edb4785",
+      []
+     ],
+     "marker-text-shadow-ref.html": [
+      "62627d64b7be67874c2f903f4465b47b16a59e63",
+      []
+     ],
      "marker-text-transform-default-ref.html": [
       "ceec36dd365556e86cdbaa09efc30f7cffb64fc3",
       []
@@ -307073,6 +308588,14 @@
       "6f959dad676467abcd5696013ac99ff888b4d4f1",
       []
      ],
+     "marker-word-break-ref.html": [
+      "683eaf1c7f64f687cedf565728d63743662577b7",
+      []
+     ],
+     "marker-word-spacing-ref.html": [
+      "a81aeee44d67045cdf2102004d767b24958e23ca",
+      []
+     ],
      "outside-marker-paint-order-ref.html": [
       "441a354732fc6690ea0d8af93dd33d57c8049374",
       []
@@ -307111,7 +308634,7 @@
        []
       ],
       "active-selection-031-ref.html": [
-       "0e3680844f887050520d8fb9b9bd2f68a2234e85",
+       "7e354e5bc68ca82e1014de470ff56eab989652e9",
        []
       ],
       "active-selection-041-notref.html": [
@@ -307134,6 +308657,14 @@
        "3ead305bfb8eaf08424b789f40efa73c26d8dfe3",
        []
       ],
+      "selection-overlay-and-grammar-001-ref.html": [
+       "f5a416ecef3547a3eca8749cdfc530a4fca5ced0",
+       []
+      ],
+      "selection-overlay-and-spelling-001-ref.html": [
+       "5dffca9f358026645bc6f8fdd0cf145250fd05bd",
+       []
+      ],
       "selection-textarea-011-ref.html": [
        "825a4247a202dac2bc3dde257ddff81f2e8eded8",
        []
@@ -307442,7 +308973,17 @@
      "nested-overflow-subtree-layout-ref.html": [
       "77b0de7f0ba16a35398c3a8d583c5bda32bf16af",
       []
-     ]
+     ],
+     "support": {
+      "flexbox-scrolling-vertical-rl.html": [
+       "1a2d02d5c71d7026c783e5215452ee7333308658",
+       []
+      ],
+      "scrolling-vertical-rl.html": [
+       "1273469dab2f53683669cc2103c0ede6e210bdc1",
+       []
+      ]
+     }
     },
     "css-scroll-snap": {
      "META.yml": [
@@ -307540,6 +309081,18 @@
       []
      ],
      "shape-outside": {
+      "assorted": {
+       "reference": {
+        "float-retry-push-ref.html": [
+         "2b0fabbda7a40a6f9cf972434818c8c438052cbd",
+         []
+        ],
+        "float-should-push-ref.html": [
+         "6a349fd359f53e95c8bdbd3cc1e6e0396652a328",
+         []
+        ]
+       }
+      },
       "formatting-context": {
        "reference": {
         "shape-outside-formatting-context-ref.html": [
@@ -307550,6 +309103,62 @@
       },
       "shape-box": {
        "reference": {
+        "shape-outside-border-box-001-ref.html": [
+         "ea248f1457b553f8eaa6d1d55b0d1d3cd10fa861",
+         []
+        ],
+        "shape-outside-border-box-002-ref.html": [
+         "f7137463d59a6e96fd0eda539aceca1281651a26",
+         []
+        ],
+        "shape-outside-border-box-border-radius-001-ref.html": [
+         "d6d061dc1b5052d409d4d23c3871842f10c1aeae",
+         []
+        ],
+        "shape-outside-border-box-border-radius-002-ref.html": [
+         "f66a499116e6356350fc6cce24680700990a174a",
+         []
+        ],
+        "shape-outside-border-box-border-radius-003-ref.html": [
+         "4639acc920430d6f03463b4e3a5699cbbaf8a7b5",
+         []
+        ],
+        "shape-outside-border-box-border-radius-004-ref.html": [
+         "bb9bdcb82d9fbd73e85c3992013a84370dfd7486",
+         []
+        ],
+        "shape-outside-border-box-border-radius-005-ref.html": [
+         "f0e0305caa72e5e9fa3d148d5bea2a758d26afe3",
+         []
+        ],
+        "shape-outside-border-box-border-radius-006-ref.html": [
+         "3f6cf9762fc8b28c8ef5c67bbba0d64d2d0304ba",
+         []
+        ],
+        "shape-outside-border-box-border-radius-007-ref.html": [
+         "0d137557c3d16b24b1b3e7f492527b983b447e17",
+         []
+        ],
+        "shape-outside-border-box-border-radius-008-ref.html": [
+         "964b38949a11c5e758a4da85363756db18e4700b",
+         []
+        ],
+        "shape-outside-border-box-border-radius-009-ref.html": [
+         "1fd0a1d9b284b913c82e0aaa1b80f4137031b994",
+         []
+        ],
+        "shape-outside-border-box-border-radius-010-ref.html": [
+         "c96d926d62f4fac391267f921a1acc2919c3a4aa",
+         []
+        ],
+        "shape-outside-border-box-border-radius-011-ref.html": [
+         "667cdf9b940cabad060a6122df7a1c5eb611c637",
+         []
+        ],
+        "shape-outside-border-box-border-radius-012-ref.html": [
+         "683c4590ecc79ae99778e05e857273be7f4129f1",
+         []
+        ],
         "shape-outside-box-001-ref.html": [
          "628cf3d588bc7ca7f9c932ab78d53752c7d28bdb",
          []
@@ -307557,6 +309166,78 @@
         "shape-outside-box-005-ref.html": [
          "092840901fcae825853506ee9414eef87df182d7",
          []
+        ],
+        "shape-outside-content-box-001-ref.html": [
+         "53c10c892f088345fca334e21f623e8a8d9b6c90",
+         []
+        ],
+        "shape-outside-content-box-002-ref.html": [
+         "aa9c34ce9221b2f5e3ef9758406f008b2004b72e",
+         []
+        ],
+        "shape-outside-content-box-border-radius-001-ref.html": [
+         "0c773005226b563f8c241f6d5322bb87b0be822b",
+         []
+        ],
+        "shape-outside-content-box-border-radius-002-ref.html": [
+         "c3dc6de8d1de210cd0b38374e9901d417da93bfd",
+         []
+        ],
+        "shape-outside-margin-box-001-ref.html": [
+         "55c7960876bc1953656e1eb7fef34c52f5250878",
+         []
+        ],
+        "shape-outside-margin-box-002-ref.html": [
+         "3806e09993c23b4ee2acfde7fe243018d701d539",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-001-ref.html": [
+         "8b7e2955f6202cf7e047d446bf26c841b0860ead",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-002-ref.html": [
+         "d24afcd71127be198f850dfb6220c463367bbd16",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-003-ref.html": [
+         "aa74b164694f8ce3b7daa1c8ffbb7bf3a2a1fd4b",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-004-ref.html": [
+         "a96f6c30de1d8f9ae64968a1bb9d8c94b3ecc2d8",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-005-ref.html": [
+         "73e4e91096bd70b4f6d83c22743ac831a7c92470",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-006-ref.html": [
+         "16ed0e557820ba3c527ae5c9020d0fa02ca45dbe",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-007-ref.html": [
+         "2c6cc1db9d4e8c4b38de9981e1dc32e71fb2e27e",
+         []
+        ],
+        "shape-outside-margin-box-border-radius-008-ref.html": [
+         "7cf8fafc933623c8a7912e8912a96d2fb178f8b5",
+         []
+        ],
+        "shape-outside-padding-box-001-ref.html": [
+         "0aa6993e37c717b74e8c2763ce1261b30d778f6e",
+         []
+        ],
+        "shape-outside-padding-box-002-ref.html": [
+         "8459758e50e88ec94644f62acca0d775ef3b98c6",
+         []
+        ],
+        "shape-outside-padding-box-border-radius-001-ref.html": [
+         "88abbd73f41039e3e0e905ad4e172bbc27d1f410",
+         []
+        ],
+        "shape-outside-padding-box-border-radius-002-ref.html": [
+         "b15f4e275b40ab6cec19ad4b176f89d6dc48c186",
+         []
         ]
        }
       },
@@ -307732,6 +309413,74 @@
          "shape-outside-circle-030-ref.html": [
           "dabff6348b1f8cc4ed30896d97aee2d044d5e0be",
           []
+         ],
+         "shape-outside-circle-032-ref.html": [
+          "e6b0fe1db83ca9a38119f5f8d7396a96b88dd04e",
+          []
+         ],
+         "shape-outside-circle-033-ref.html": [
+          "3814e2eebd2f98d7a33c44077304f188f9afde0a",
+          []
+         ],
+         "shape-outside-circle-034-ref.html": [
+          "5cf26ced5991d23940ade42e8adddf91ca34250a",
+          []
+         ],
+         "shape-outside-circle-035-ref.html": [
+          "7fcd50eff0e03c752b663fbd0a81d2f2f30c9d6d",
+          []
+         ],
+         "shape-outside-circle-036-ref.html": [
+          "a731f206a2f0924c53c974b3a1e11a8016bb6277",
+          []
+         ],
+         "shape-outside-circle-041-ref.html": [
+          "fbf2516bbd6128ae51db2cf72333775a093f35b2",
+          []
+         ],
+         "shape-outside-circle-042-ref.html": [
+          "c7a49302ca9bd8408af89b608a948c25a07fdf92",
+          []
+         ],
+         "shape-outside-circle-047-ref.html": [
+          "a518cfd3617a732ccfea717be359012bfb9f31ed",
+          []
+         ],
+         "shape-outside-circle-048-ref.html": [
+          "12ed0a1f525657f3e4fb35160a5e692c6893158b",
+          []
+         ],
+         "shape-outside-circle-049-ref.html": [
+          "8da63255648ba64dff82a4e0b09c428492d4b27e",
+          []
+         ],
+         "shape-outside-circle-050-ref.html": [
+          "0991b5961f3dec0bedc2e5662aeef66d5b21c053",
+          []
+         ],
+         "shape-outside-circle-051-ref.html": [
+          "5178b55964e3221785726ce548cac5f7698957cc",
+          []
+         ],
+         "shape-outside-circle-052-ref.html": [
+          "12376fbc7acb95033a0fa1241393b25a1409ddf7",
+          []
+         ],
+         "shape-outside-circle-053-ref.html": [
+          "281bd8834e63292362f8ba417e6a75dc6551378c",
+          []
+         ],
+         "shape-outside-circle-054-ref.html": [
+          "4f1cdae15f0f97bd106ee3749c868e7eb4153734",
+          []
+         ],
+         "shape-outside-circle-055-ref.html": [
+          "97fc1e9fc83868c17c3c0953930f533f2582c356",
+          []
+         ],
+         "shape-outside-circle-056-ref.html": [
+          "519d33864d811ca71c15ab4d1b7572371f48e2a9",
+          []
          ]
         }
        },
@@ -307748,6 +309497,82 @@
          "shape-outside-ellipse-030-ref.html": [
           "875252ac8725f11586f5493d4cf0efbd3d344343",
           []
+         ],
+         "shape-outside-ellipse-032-ref.html": [
+          "41399373d8eb2636129d008d5f3d4ec0d20e9e3d",
+          []
+         ],
+         "shape-outside-ellipse-033-ref.html": [
+          "6ed9f09562fa25a65a0f4f08280092a8b9ed4b22",
+          []
+         ],
+         "shape-outside-ellipse-034-ref.html": [
+          "c981e0710866c4bbd97a5c7ede6a8f331b681e69",
+          []
+         ],
+         "shape-outside-ellipse-035-ref.html": [
+          "c9d4bbb6b506ac54207174fe42075c7462fe6ce9",
+          []
+         ],
+         "shape-outside-ellipse-036-ref.html": [
+          "ddbb79eaa2bf8395d945a8202dc7600eda1355d3",
+          []
+         ],
+         "shape-outside-ellipse-037-ref.html": [
+          "6dbe9ec777764610a3270b7b4a60542d2d95138a",
+          []
+         ],
+         "shape-outside-ellipse-038-ref.html": [
+          "851d16ffab513cfbbe03fff17014a4f58e7de0c9",
+          []
+         ],
+         "shape-outside-ellipse-039-ref.html": [
+          "b7d4e5d97565df3dc4c21ccb49dbefa743f25439",
+          []
+         ],
+         "shape-outside-ellipse-040-ref.html": [
+          "c39885e056e2ef630f5868867dc73898b53ac043",
+          []
+         ],
+         "shape-outside-ellipse-042-ref.html": [
+          "26c36948a74b4b27c1086594dea562aca308eb42",
+          []
+         ],
+         "shape-outside-ellipse-044-ref.html": [
+          "5fd0f7141c902f0f8527e49dc0566a8b23be87b4",
+          []
+         ],
+         "shape-outside-ellipse-045-ref.html": [
+          "c33c34d3cc5a5ecb58fd6745e519d4f119239459",
+          []
+         ],
+         "shape-outside-ellipse-046-ref.html": [
+          "ec88f678a93d972d7b49af61f0e58d8864ef8d21",
+          []
+         ],
+         "shape-outside-ellipse-047-ref.html": [
+          "cf340ee39de576d0c12b3c969f18596a8e38ffbf",
+          []
+         ],
+         "shape-outside-ellipse-048-ref.html": [
+          "9e73dd550bc65d100a287f3439b9a8720f0d6de6",
+          []
+         ],
+         "shape-outside-ellipse-049-ref.html": [
+          "e021c6d688243cc34e487c23d41d3d21e65914db",
+          []
+         ],
+         "shape-outside-ellipse-050-ref.html": [
+          "aab9ddde0375e3b7dce567bf133edbedd4c08ce2",
+          []
+         ],
+         "shape-outside-ellipse-051-ref.html": [
+          "7e0ef6463598f92c86484b0b0470eda448118f23",
+          []
+         ],
+         "shape-outside-ellipse-052-ref.html": [
+          "519d33864d811ca71c15ab4d1b7572371f48e2a9",
+          []
          ]
         }
        },
@@ -307756,6 +309581,46 @@
          "shape-outside-inset-010-ref.html": [
           "8e2a5fae12de6df57903ccdaf878c94417667ae2",
           []
+         ],
+         "shape-outside-inset-016-ref.html": [
+          "0ecdd155de1689c622f8d105f85adb996170e88e",
+          []
+         ],
+         "shape-outside-inset-017-ref.html": [
+          "73e73ee7a0650d815e68401e4ebeba95fe81ddd4",
+          []
+         ],
+         "shape-outside-inset-020-ref.html": [
+          "216aae87f096fc25c7ce1f3028e8dc26c36964e2",
+          []
+         ],
+         "shape-outside-inset-021-ref.html": [
+          "093efad406861c8d9e86ec0e681cb3f76ba434da",
+          []
+         ],
+         "shape-outside-inset-022-ref.html": [
+          "b4816ce00f8b6d9152366bc226a86ef73b74c396",
+          []
+         ],
+         "shape-outside-inset-023-ref.html": [
+          "9c7ca3593531e1660a2889e4abdfd79e9b9ab6be",
+          []
+         ],
+         "shape-outside-inset-024-ref.html": [
+          "f2dc323c6d462d3200fcbc1d1b69503324f13192",
+          []
+         ],
+         "shape-outside-inset-025-ref.html": [
+          "2758b88e7c9d2500f7afc02f6a47997ad0db75ca",
+          []
+         ],
+         "shape-outside-inset-026-ref.html": [
+          "c0325445cb36a4826c87253beb48cb667a955156",
+          []
+         ],
+         "shape-outside-inset-027-ref.html": [
+          "3791a6f1bb2e3db5cbd69ee01728edd378bd869f",
+          []
          ]
         }
        },
@@ -307772,6 +309637,42 @@
          "shape-outside-polygon-017-ref.html": [
           "56c5b9b85525f181ed7e47eaca96a5cd9c82cb14",
           []
+         ],
+         "shape-outside-polygon-018-ref.html": [
+          "86a84ad9707cdc662e578603f6d9636383757822",
+          []
+         ],
+         "shape-outside-polygon-019-ref.html": [
+          "ec5cf47fdb9514d320b5550efeba3f791e8bed6c",
+          []
+         ],
+         "shape-outside-polygon-020-ref.html": [
+          "7a7eb7120f8d56f1f8013be366bdff08cc7d684a",
+          []
+         ],
+         "shape-outside-polygon-021-ref.html": [
+          "2cb51b8f0ad65e870842f99f86dd7f02af59cca8",
+          []
+         ],
+         "shape-outside-polygon-022-ref.html": [
+          "7cc0eb6836b51e4188cc28e8f157e6aa67aeadc7",
+          []
+         ],
+         "shape-outside-polygon-023-ref.html": [
+          "5ec5c24b4cfe9c48055d8d6b3341aa6d80606aef",
+          []
+         ],
+         "shape-outside-polygon-024-ref.html": [
+          "64bb8e6798df4b3243fda3bc557e8b6ee0e696df",
+          []
+         ],
+         "shape-outside-polygon-025-ref.html": [
+          "c934b148f0b6c1f7250c880e9d7bba5beea2ab7a",
+          []
+         ],
+         "shape-outside-polygon-032-ref.html": [
+          "b3f7028eec4112f1b818e95d474b725193e79b84",
+          []
          ]
         }
        },
@@ -307985,6 +309886,10 @@
      ],
      "aspect-ratio": {
       "reference": {
+       "ref-filled-green-100x20-rect.html": [
+        "5d8ebce4ec5a42533cb82829b778e1f65029d7e4",
+        []
+       ],
        "ref-square-with-scrollbar.html": [
         "128bf336e71e442410620cf2b52720ef6d2037cc",
         []
@@ -308485,6 +310390,14 @@
         "ba2371f8b00287d22bd5d576e962ac78f5678d7d",
         []
        ],
+       "utf8-bom-http-windows-1251.css": [
+        "1dbf5cf2fceebcdc60611b356b425fa23dc26040",
+        []
+       ],
+       "utf8-bom-http-windows-1251.css.headers": [
+        "9a67b0fea443211f162c0a35b7ee24556594732c",
+        []
+       ],
        "utf8-bom.css": [
         "1dbf5cf2fceebcdc60611b356b425fa23dc26040",
         []
@@ -310232,10 +312145,22 @@
        "5e253df9490e5182dde59a23077815a2176583ee",
        []
       ],
+      "tab-size-inline-001-ref.html": [
+       "36347454947367e8fd4a00825e216ad294a4cc1b",
+       []
+      ],
+      "tab-size-inline-002-ref.html": [
+       "b595b3f9a5d120af3a521cefc7838cdfb52065d7",
+       []
+      ],
       "tab-size-integer-001-ref.html": [
        "db1d6b0ed5b9f16779841931ef5a999dbcd1ea50",
        []
       ],
+      "tab-size-integer-004-ref.html": [
+       "0f29998d2387462262b5b00c988d143c64cce7c6",
+       []
+      ],
       "tab-size-length-001-ref.html": [
        "8b574c694f3122059fb25777dfd19962df2aaee5",
        []
@@ -310938,7 +312863,11 @@
         []
        ],
        "eol-spaces-bidi-001-ref.html": [
-        "37da6649f9b776cb046a2bacdeb24968d27a2af8",
+        "430706c55697597681c71202dd4cb18da8b5de37",
+        []
+       ],
+       "eol-spaces-bidi-002-ref.html": [
+        "30a4ffd303d55f6228b886aa658822975601967a",
         []
        ],
        "line-edge-white-space-collapse-001-ref.html": [
@@ -311033,6 +312962,10 @@
         "9f579f29e0c897c744e1b06d5d2d60e85612f823",
         []
        ],
+       "trailing-ogham-001-ref.html": [
+        "1b6fddd30e2389f5cd3cba0f794d13c8a9ce98b5",
+        []
+       ],
        "trailing-other-space-separators-001-ref.html": [
         "e406b86a3a4b32e0b3367ea26c6e3f3ca8e44338",
         []
@@ -313389,14 +315322,6 @@
       "5c5cdb42e7078b18ed1e4f58f34747ce76d50c02",
       []
      ],
-     "appearance-button-001-ref.html": [
-      "3e4da522e54314d0861f35c7b38fcfd39f58ea60",
-      []
-     ],
-     "appearance-button-002.tentative-ref.html": [
-      "c8c10ea511f51f31201c1dfb49df5d97ed021af1",
-      []
-     ],
      "appearance-progress-bar-002-ref.html": [
       "d243f0c75c75f57e6fd1ca629ccf0d3d924a0c13",
       []
@@ -314856,7 +316781,11 @@
         []
        ]
       }
-     }
+     },
+     "viewport-units-001-print-ref.html": [
+      "bc914522c7fcf556c69ba56d2d0ba792d7e92b89",
+      []
+     ]
     },
     "css-variables": {
      "META.yml": [
@@ -314957,6 +316886,10 @@
       "38138ebcac3d73796e00173f6a84ba7edaa17cd2",
       []
      ],
+     "will-change-stacking-context-003-ref.html": [
+      "38138ebcac3d73796e00173f6a84ba7edaa17cd2",
+      []
+     ],
      "will-change-transform-image-ref.html": [
       "d42d5b7fea22d3d2bc2abf782b1efc78f261f69e",
       []
@@ -319713,7 +321646,7 @@
          []
         ],
         "reftest.list": [
-         "cdaad122cbe1c9ded075a0239ec3d26d01a3d2e8",
+         "21cdb382112ee94931ca5582f9db3b0e05270574",
          []
         ],
         "support": {
@@ -321628,7 +323561,7 @@
         ]
        },
        "reftest.list": [
-        "97621fe19fe42c95103d8bbd100fece50d0f51be",
+        "fc45fc352c0ac7a9e43afa1dfd8cfcb23962ebf8",
         []
        ],
        "ruby": {
@@ -321737,374 +323670,6 @@
          []
         ]
        },
-       "shapes1": {
-        "float-retry-push-ref.html": [
-         "2b0fabbda7a40a6f9cf972434818c8c438052cbd",
-         []
-        ],
-        "float-should-push-ref.html": [
-         "6a349fd359f53e95c8bdbd3cc1e6e0396652a328",
-         []
-        ],
-        "reftest.list": [
-         "ab097ac7f952c1f1b732c2812062808d860a13ae",
-         []
-        ],
-        "shape-outside-border-box-001-ref.html": [
-         "ea248f1457b553f8eaa6d1d55b0d1d3cd10fa861",
-         []
-        ],
-        "shape-outside-border-box-002-ref.html": [
-         "f7137463d59a6e96fd0eda539aceca1281651a26",
-         []
-        ],
-        "shape-outside-border-box-border-radius-001-ref.html": [
-         "d6d061dc1b5052d409d4d23c3871842f10c1aeae",
-         []
-        ],
-        "shape-outside-border-box-border-radius-002-ref.html": [
-         "f66a499116e6356350fc6cce24680700990a174a",
-         []
-        ],
-        "shape-outside-border-box-border-radius-003-ref.html": [
-         "4639acc920430d6f03463b4e3a5699cbbaf8a7b5",
-         []
-        ],
-        "shape-outside-border-box-border-radius-004-ref.html": [
-         "bb9bdcb82d9fbd73e85c3992013a84370dfd7486",
-         []
-        ],
-        "shape-outside-border-box-border-radius-005-ref.html": [
-         "f0e0305caa72e5e9fa3d148d5bea2a758d26afe3",
-         []
-        ],
-        "shape-outside-border-box-border-radius-006-ref.html": [
-         "3f6cf9762fc8b28c8ef5c67bbba0d64d2d0304ba",
-         []
-        ],
-        "shape-outside-border-box-border-radius-007-ref.html": [
-         "0d137557c3d16b24b1b3e7f492527b983b447e17",
-         []
-        ],
-        "shape-outside-border-box-border-radius-008-ref.html": [
-         "964b38949a11c5e758a4da85363756db18e4700b",
-         []
-        ],
-        "shape-outside-border-box-border-radius-009-ref.html": [
-         "1fd0a1d9b284b913c82e0aaa1b80f4137031b994",
-         []
-        ],
-        "shape-outside-border-box-border-radius-010-ref.html": [
-         "c96d926d62f4fac391267f921a1acc2919c3a4aa",
-         []
-        ],
-        "shape-outside-border-box-border-radius-011-ref.html": [
-         "667cdf9b940cabad060a6122df7a1c5eb611c637",
-         []
-        ],
-        "shape-outside-border-box-border-radius-012-ref.html": [
-         "683c4590ecc79ae99778e05e857273be7f4129f1",
-         []
-        ],
-        "shape-outside-circle-032-ref.html": [
-         "e6b0fe1db83ca9a38119f5f8d7396a96b88dd04e",
-         []
-        ],
-        "shape-outside-circle-033-ref.html": [
-         "3814e2eebd2f98d7a33c44077304f188f9afde0a",
-         []
-        ],
-        "shape-outside-circle-034-ref.html": [
-         "5cf26ced5991d23940ade42e8adddf91ca34250a",
-         []
-        ],
-        "shape-outside-circle-035-ref.html": [
-         "7fcd50eff0e03c752b663fbd0a81d2f2f30c9d6d",
-         []
-        ],
-        "shape-outside-circle-036-ref.html": [
-         "a731f206a2f0924c53c974b3a1e11a8016bb6277",
-         []
-        ],
-        "shape-outside-circle-041-ref.html": [
-         "fbf2516bbd6128ae51db2cf72333775a093f35b2",
-         []
-        ],
-        "shape-outside-circle-042-ref.html": [
-         "c7a49302ca9bd8408af89b608a948c25a07fdf92",
-         []
-        ],
-        "shape-outside-circle-047-ref.html": [
-         "a518cfd3617a732ccfea717be359012bfb9f31ed",
-         []
-        ],
-        "shape-outside-circle-048-ref.html": [
-         "12ed0a1f525657f3e4fb35160a5e692c6893158b",
-         []
-        ],
-        "shape-outside-circle-049-ref.html": [
-         "8da63255648ba64dff82a4e0b09c428492d4b27e",
-         []
-        ],
-        "shape-outside-circle-050-ref.html": [
-         "0991b5961f3dec0bedc2e5662aeef66d5b21c053",
-         []
-        ],
-        "shape-outside-circle-051-ref.html": [
-         "5178b55964e3221785726ce548cac5f7698957cc",
-         []
-        ],
-        "shape-outside-circle-052-ref.html": [
-         "12376fbc7acb95033a0fa1241393b25a1409ddf7",
-         []
-        ],
-        "shape-outside-circle-053-ref.html": [
-         "281bd8834e63292362f8ba417e6a75dc6551378c",
-         []
-        ],
-        "shape-outside-circle-054-ref.html": [
-         "4f1cdae15f0f97bd106ee3749c868e7eb4153734",
-         []
-        ],
-        "shape-outside-circle-055-ref.html": [
-         "97fc1e9fc83868c17c3c0953930f533f2582c356",
-         []
-        ],
-        "shape-outside-circle-056-ref.html": [
-         "519d33864d811ca71c15ab4d1b7572371f48e2a9",
-         []
-        ],
-        "shape-outside-content-box-001-ref.html": [
-         "53c10c892f088345fca334e21f623e8a8d9b6c90",
-         []
-        ],
-        "shape-outside-content-box-002-ref.html": [
-         "aa9c34ce9221b2f5e3ef9758406f008b2004b72e",
-         []
-        ],
-        "shape-outside-content-box-border-radius-001-ref.html": [
-         "0c773005226b563f8c241f6d5322bb87b0be822b",
-         []
-        ],
-        "shape-outside-content-box-border-radius-002-ref.html": [
-         "c3dc6de8d1de210cd0b38374e9901d417da93bfd",
-         []
-        ],
-        "shape-outside-ellipse-032-ref.html": [
-         "41399373d8eb2636129d008d5f3d4ec0d20e9e3d",
-         []
-        ],
-        "shape-outside-ellipse-033-ref.html": [
-         "6ed9f09562fa25a65a0f4f08280092a8b9ed4b22",
-         []
-        ],
-        "shape-outside-ellipse-034-ref.html": [
-         "c981e0710866c4bbd97a5c7ede6a8f331b681e69",
-         []
-        ],
-        "shape-outside-ellipse-035-ref.html": [
-         "c9d4bbb6b506ac54207174fe42075c7462fe6ce9",
-         []
-        ],
-        "shape-outside-ellipse-036-ref.html": [
-         "ddbb79eaa2bf8395d945a8202dc7600eda1355d3",
-         []
-        ],
-        "shape-outside-ellipse-037-ref.html": [
-         "6dbe9ec777764610a3270b7b4a60542d2d95138a",
-         []
-        ],
-        "shape-outside-ellipse-038-ref.html": [
-         "851d16ffab513cfbbe03fff17014a4f58e7de0c9",
-         []
-        ],
-        "shape-outside-ellipse-039-ref.html": [
-         "b7d4e5d97565df3dc4c21ccb49dbefa743f25439",
-         []
-        ],
-        "shape-outside-ellipse-040-ref.html": [
-         "c39885e056e2ef630f5868867dc73898b53ac043",
-         []
-        ],
-        "shape-outside-ellipse-042-ref.html": [
-         "26c36948a74b4b27c1086594dea562aca308eb42",
-         []
-        ],
-        "shape-outside-ellipse-044-ref.html": [
-         "5fd0f7141c902f0f8527e49dc0566a8b23be87b4",
-         []
-        ],
-        "shape-outside-ellipse-045-ref.html": [
-         "c33c34d3cc5a5ecb58fd6745e519d4f119239459",
-         []
-        ],
-        "shape-outside-ellipse-046-ref.html": [
-         "ec88f678a93d972d7b49af61f0e58d8864ef8d21",
-         []
-        ],
-        "shape-outside-ellipse-047-ref.html": [
-         "cf340ee39de576d0c12b3c969f18596a8e38ffbf",
-         []
-        ],
-        "shape-outside-ellipse-048-ref.html": [
-         "9e73dd550bc65d100a287f3439b9a8720f0d6de6",
-         []
-        ],
-        "shape-outside-ellipse-049-ref.html": [
-         "e021c6d688243cc34e487c23d41d3d21e65914db",
-         []
-        ],
-        "shape-outside-ellipse-050-ref.html": [
-         "aab9ddde0375e3b7dce567bf133edbedd4c08ce2",
-         []
-        ],
-        "shape-outside-ellipse-051-ref.html": [
-         "7e0ef6463598f92c86484b0b0470eda448118f23",
-         []
-        ],
-        "shape-outside-ellipse-052-ref.html": [
-         "519d33864d811ca71c15ab4d1b7572371f48e2a9",
-         []
-        ],
-        "shape-outside-inset-016-ref.html": [
-         "0ecdd155de1689c622f8d105f85adb996170e88e",
-         []
-        ],
-        "shape-outside-inset-017-ref.html": [
-         "73e73ee7a0650d815e68401e4ebeba95fe81ddd4",
-         []
-        ],
-        "shape-outside-inset-020-ref.html": [
-         "216aae87f096fc25c7ce1f3028e8dc26c36964e2",
-         []
-        ],
-        "shape-outside-inset-021-ref.html": [
-         "093efad406861c8d9e86ec0e681cb3f76ba434da",
-         []
-        ],
-        "shape-outside-inset-022-ref.html": [
-         "b4816ce00f8b6d9152366bc226a86ef73b74c396",
-         []
-        ],
-        "shape-outside-inset-023-ref.html": [
-         "9c7ca3593531e1660a2889e4abdfd79e9b9ab6be",
-         []
-        ],
-        "shape-outside-inset-024-ref.html": [
-         "f2dc323c6d462d3200fcbc1d1b69503324f13192",
-         []
-        ],
-        "shape-outside-inset-025-ref.html": [
-         "2758b88e7c9d2500f7afc02f6a47997ad0db75ca",
-         []
-        ],
-        "shape-outside-inset-026-ref.html": [
-         "c0325445cb36a4826c87253beb48cb667a955156",
-         []
-        ],
-        "shape-outside-inset-027-ref.html": [
-         "3791a6f1bb2e3db5cbd69ee01728edd378bd869f",
-         []
-        ],
-        "shape-outside-margin-box-001-ref.html": [
-         "55c7960876bc1953656e1eb7fef34c52f5250878",
-         []
-        ],
-        "shape-outside-margin-box-002-ref.html": [
-         "3806e09993c23b4ee2acfde7fe243018d701d539",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-001-ref.html": [
-         "8b7e2955f6202cf7e047d446bf26c841b0860ead",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-002-ref.html": [
-         "d24afcd71127be198f850dfb6220c463367bbd16",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-003-ref.html": [
-         "aa74b164694f8ce3b7daa1c8ffbb7bf3a2a1fd4b",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-004-ref.html": [
-         "a96f6c30de1d8f9ae64968a1bb9d8c94b3ecc2d8",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-005-ref.html": [
-         "73e4e91096bd70b4f6d83c22743ac831a7c92470",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-006-ref.html": [
-         "16ed0e557820ba3c527ae5c9020d0fa02ca45dbe",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-007-ref.html": [
-         "2c6cc1db9d4e8c4b38de9981e1dc32e71fb2e27e",
-         []
-        ],
-        "shape-outside-margin-box-border-radius-008-ref.html": [
-         "7cf8fafc933623c8a7912e8912a96d2fb178f8b5",
-         []
-        ],
-        "shape-outside-padding-box-001-ref.html": [
-         "0aa6993e37c717b74e8c2763ce1261b30d778f6e",
-         []
-        ],
-        "shape-outside-padding-box-002-ref.html": [
-         "8459758e50e88ec94644f62acca0d775ef3b98c6",
-         []
-        ],
-        "shape-outside-padding-box-border-radius-001-ref.html": [
-         "88abbd73f41039e3e0e905ad4e172bbc27d1f410",
-         []
-        ],
-        "shape-outside-padding-box-border-radius-002-ref.html": [
-         "b15f4e275b40ab6cec19ad4b176f89d6dc48c186",
-         []
-        ],
-        "shape-outside-polygon-018-ref.html": [
-         "86a84ad9707cdc662e578603f6d9636383757822",
-         []
-        ],
-        "shape-outside-polygon-019-ref.html": [
-         "ec5cf47fdb9514d320b5550efeba3f791e8bed6c",
-         []
-        ],
-        "shape-outside-polygon-020-ref.html": [
-         "7a7eb7120f8d56f1f8013be366bdff08cc7d684a",
-         []
-        ],
-        "shape-outside-polygon-021-ref.html": [
-         "2cb51b8f0ad65e870842f99f86dd7f02af59cca8",
-         []
-        ],
-        "shape-outside-polygon-022-ref.html": [
-         "7cc0eb6836b51e4188cc28e8f157e6aa67aeadc7",
-         []
-        ],
-        "shape-outside-polygon-023-ref.html": [
-         "5ec5c24b4cfe9c48055d8d6b3341aa6d80606aef",
-         []
-        ],
-        "shape-outside-polygon-024-ref.html": [
-         "64bb8e6798df4b3243fda3bc557e8b6ee0e696df",
-         []
-        ],
-        "shape-outside-polygon-025-ref.html": [
-         "c934b148f0b6c1f7250c880e9d7bba5beea2ab7a",
-         []
-        ],
-        "shape-outside-polygon-032-ref.html": [
-         "b3f7028eec4112f1b818e95d474b725193e79b84",
-         []
-        ],
-        "support": {
-         "Ahem.ttf": [
-          "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
-          []
-         ]
-        }
-       },
        "sizing": {
         "block-size-with-min-or-max-content-1-ref.html": [
          "ae170ffd9a25473c94fa237090db5d2b5b78b4b9",
@@ -323071,7 +324636,7 @@
      []
     ],
     "Makefile": [
-     "1b7fe8e8f59277413c00cfe4d7080aa97eb449a0",
+     "9bd9c429f551e069f82e4b981193a0a7f284741d",
      []
     ],
     "README.md": [
@@ -323084,7 +324649,11 @@
     ],
     "admin": {
      "index.md": [
-      "98725bfa31b90162ae7fe9a3f381a8d9494db09c",
+      "3073b9678fe890efee20ac122e73d30f0ce7fbb1",
+      []
+     ],
+     "pywebsocket3.rst": [
+      "af768d6b354600b32ed1d01463bd1724520c1fc8",
       []
      ]
     },
@@ -323155,7 +324724,7 @@
      []
     ],
     "conf.py": [
-     "89f30a02a336d29c20a530a1d277586aa409da46",
+     "44d3c2f76bbcd6364e6bd81015ee9d0caaca21b9",
      []
     ],
     "frontend.py": [
@@ -323171,7 +324740,7 @@
      []
     ],
     "make.bat": [
-     "49607bb0ae936d9d8df9b1d1f16ce72e918108bc",
+     "415076a912f4fcaa9e1fd3a4264a732d42262b31",
      []
     ],
     "requirements.txt": [
@@ -323226,7 +324795,7 @@
       []
      ],
      "from-local-system.md": [
-      "91823444d5d4813afb020d00b2fca188f4a22f21",
+      "f5cfa36915d7892d827d8f5aa74649e0e2c0c062",
       []
      ],
      "from-web.md": [
@@ -323292,7 +324861,7 @@
       []
      ],
      "idlharness.md": [
-      "13e1dc03fef758e710ec2046395cdad4a5a8117f",
+      "4af4224e6448c75de3345325183e310407688657",
       []
      ],
      "index.md": [
@@ -323338,7 +324907,7 @@
       []
      ],
      "server-pipes.md": [
-      "4f4011a6c2148dc91358e89f31f234a6fd82d7b8",
+      "07723c289dbbeb14adb385d15849a47d648e1d47",
       []
      ],
      "submission-process.md": [
@@ -323358,7 +324927,7 @@
       []
      ],
      "testharness-api.md": [
-      "38997a2dcc945c3c569b1348313ba92dff5fec85",
+      "fb0af83c9a92409207e380dd17717f8a026f2d95",
       []
      ],
      "testharness-tutorial.md": [
@@ -323366,7 +324935,7 @@
       []
      ],
      "testharness.md": [
-      "1037eaca03c702383c0b9caab07fa98cdec4b4c0",
+      "7cf7f73a868e0a084bebb2c17757054773e5683f",
       []
      ],
      "tools.md": [
@@ -323385,11 +324954,11 @@
    },
    "document-policy": {
     "echo-policy-nested.html": [
-     "d572dcb0465843c3d694d808c8bc883cd54fbf89",
+     "5a01f4e1ece983dc44136b763dc93430a5578c2b",
      []
     ],
     "echo-policy-nested.html.headers": [
-     "a6c7386bda08d7af692b7c949e1e36a29ee3504a",
+     "419a3c3dd16dcf7d6dfdcbcd86ad26314f9ac368",
      []
     ],
     "echo-policy.py": [
@@ -323414,14 +324983,34 @@
        "79316cb488fade6e877c690f90c74961ff944f52",
        []
       ],
+      "async-script.js": [
+       "3c0ee6d02343891b0234f31c0fb229929ae1b24b",
+       []
+      ],
       "common.js": [
        "639847abf36d636e537c081a6afd06a3a8fb7f9f",
        []
       ],
+      "defer-script.js": [
+       "8d248ee0d01402bf016255d82c2b59d337c33b45",
+       []
+      ],
       "document-policy-image.html": [
        "4e5b919bd112f044cc3ec9e57afe05ae20f22ece",
        []
       ],
+      "document-write-allowed.html": [
+       "633fa85e6acd6c5dd9cfcd1dfd9929abf15214f8",
+       []
+      ],
+      "document-write-disallowed.html": [
+       "633fa85e6acd6c5dd9cfcd1dfd9929abf15214f8",
+       []
+      ],
+      "document-write-disallowed.html.headers": [
+       "32846f724a4a4aa3067bd2908be52942e52affdd",
+       []
+      ],
       "image.jpg": [
        "430f5c514a86f110293636b513b396ac1ab5ed80",
        []
@@ -323434,11 +325023,23 @@
        "73ca820915bbdccdf4fd2d3960c795f1cea8e181",
        []
       ],
+      "parser-blocking-script.js": [
+       "c61efee8a0a15801d474fd8b384de01e565e37ce",
+       []
+      ],
+      "sync-script-test.js": [
+       "65c1b21e6e8274dc06679a67c79a67dc1ba756c4",
+       []
+      ],
       "video.ogv": [
        "c9ee910fc667632b17420c1f0ad4f7ad2ac7446a",
        []
       ]
      },
+     "sync-script.tentative.https.sub.html.headers": [
+      "cfe200c27b007ebb8f470c9b19a59589e68500e3",
+      []
+     ],
      "unsized-media.tentative.https.sub.html.headers": [
       "cf59933e8dd61a728ada5644a71808c36e7b0876",
       []
@@ -323463,11 +325064,27 @@
      ]
     },
     "reporting": {
+     "document-write-report-only-tentative.html.headers": [
+      "924dac8e87b3d5639857dd45c759fed7f263ba5d",
+      []
+     ],
+     "document-write-reporting-tentative.html.headers": [
+      "6d05e969b5047b88f7145233549460fbc7e7f594",
+      []
+     ],
      "image.jpg": [
       "c059b96d97fc3701ce4325165b79948f69189135",
       []
      ],
-     "oversized-images-reporting.html.headers": [
+     "lossy-images-max-bpp-reporting-onload-tentative.html.headers": [
+      "cb28d40ec152667456889c5fdcfd93947218b461",
+      []
+     ],
+     "lossy-images-max-bpp-reporting-tentative.html.headers": [
+      "cb28d40ec152667456889c5fdcfd93947218b461",
+      []
+     ],
+     "oversized-images-reporting-tentative.html.headers": [
       "10f5be1c33409e9c06304430ee5e8cbe45157ca1",
       []
      ],
@@ -323479,30 +325096,22 @@
       "599137a55d710fe6b8d3052c05c81915622ea0d0",
       []
      ],
-     "unoptimized-lossy-images-reporting-onload.html.headers": [
-      "3cad9badac38ec53f88b98b53ca6450e7942dc69",
-      []
-     ],
-     "unoptimized-lossy-images-reporting.html.headers": [
-      "3cad9badac38ec53f88b98b53ca6450e7942dc69",
-      []
-     ],
-     "unsized-media-reporting.html.headers": [
+     "unsized-media-reporting-tentative.html.headers": [
       "cf59933e8dd61a728ada5644a71808c36e7b0876",
       []
      ]
     },
     "required-policy": {
      "document-policy.html.headers": [
-      "8ea51b103f9e3f365c16e41ded5c87a646984433",
+      "20629ac15f53b45818e4357a33f544b7f523e466",
       []
      ],
      "required-document-policy.html.headers": [
-      "7f5cd92a482b3b29e7bfa89461cc4812b1e349a8",
+      "ac1bf268b50a75411e6819abbadc8e493dd9a612",
       []
      ],
      "separate-document-policies.html.headers": [
-      "c90842175d92cff67627f397fdce63d6e95c7b2f",
+      "3c593a32aa1b4b50cc479425c7157f80c77442da",
       []
      ]
     },
@@ -325565,7 +327174,7 @@
      []
     ],
     "README.md": [
-     "60bbea3f3b97921780f8c4ad1e4847cdeaaff32f",
+     "e19a0ba6c7448e9a069fb1a5eb9d80c18b733aff",
      []
     ],
     "dedicated-worker": {
@@ -325697,27 +327306,15 @@
      []
     ],
     "README.md": [
-     "48cb95ebf749d67b4965f5e24f20e36ede749600",
+     "646fc1e0bec21757d67433bc5456ad9ffad155cc",
      []
     ],
     "experimental-features": {
      "resources": {
-      "async-script.js": [
-       "3c0ee6d02343891b0234f31c0fb229929ae1b24b",
-       []
-      ],
       "common.js": [
        "c6bea8175129f158f9d2c90c5463cd54f4919a2a",
        []
       ],
-      "defer-script.js": [
-       "8d248ee0d01402bf016255d82c2b59d337c33b45",
-       []
-      ],
-      "document-write.html": [
-       "633fa85e6acd6c5dd9cfcd1dfd9929abf15214f8",
-       []
-      ],
       "feature-policy-trust-token-redemption.html": [
        "6ae6f6fa4d4684af4b839658ed295d7cfec976cd",
        []
@@ -325734,14 +327331,6 @@
        "fd3da53a29c3e7f55f950611d34694867b0ff0a4",
        []
       ],
-      "parser-blocking-script.js": [
-       "c61efee8a0a15801d474fd8b384de01e565e37ce",
-       []
-      ],
-      "sync-script-test.js": [
-       "65c1b21e6e8274dc06679a67c79a67dc1ba756c4",
-       []
-      ],
       "vertical-scroll-scrollable-content.html": [
        "9f78ea4bc2975abf6d37a24952df48e6dc75400f",
        []
@@ -325771,10 +327360,6 @@
        []
       ]
      },
-     "sync-script.tentative.https.sub.html.headers": [
-      "b468c8b1822d57cbf8c78523397a43813cefe51c",
-      []
-     ],
      "vertical-scroll-main-frame-manual.tentative.html.headers": [
       "44072fce5640c79fcbd804550bfce44dbad37738",
       []
@@ -325893,14 +327478,6 @@
       "2adc5e237fcec874767ff8f5ab38e3456c02cbf0",
       []
      ],
-     "document-write-report-only.html.headers": [
-      "bd1418700c23c2d829801fcda25998a8fd315fae",
-      []
-     ],
-     "document-write-reporting.html.headers": [
-      "57102d5ee7c072e433fa44c0c13521573b32f469",
-      []
-     ],
      "encrypted-media-report-only.https.html.headers": [
       "37e625f31d13dcca90acbccfbcae06f9be3ec5e5",
       []
@@ -326757,7 +328334,7 @@
        []
       ],
       "post-to-owner.py": [
-       "c5ee11653ef2a8d291aceac3ae97670463fda7fe",
+       "4890c49acbdfb557b9ef679b0a3cc82952305c0f",
        []
       ],
       "record-header.py": [
@@ -326911,6 +328488,26 @@
      ]
     }
    },
+   "font-access": {
+    "README.md": [
+     "f0d654ed398412143fdab5302509988f50e816e8",
+     []
+    ],
+    "resources": {
+     "test-expectations.js": [
+      "6baaeb8ea2689159f80086967b6fa547fb84b807",
+      []
+     ],
+     "window-tests-blob.js": [
+      "0d6db5399118372da9ca783eeb2551e435ea85d7",
+      []
+     ],
+     "window-tests-enumeration.js": [
+      "477d973a3a9e770030cb7a52b1fdc5794dd3b789",
+      []
+     ]
+    }
+   },
    "fonts": {
     "AD.woff": [
      "3df8ea8efdabd11bc45fdcc6d4f3fec771be6650",
@@ -327652,6 +329249,10 @@
      "forced-colors-mode-backplate-10-ref.html": [
       "b5b58bd567aab224c4bc79fc07a044548c1b3421",
       []
+     ],
+     "forced-colors-mode-backplate-11-ref.html": [
+      "29486d51ce0933c16893267b0401c8a7e75f237a",
+      []
      ]
     },
     "forced-colors-mode-01-ref.html": [
@@ -327675,7 +329276,7 @@
      []
     ],
     "forced-colors-mode-08-ref.html": [
-     "6d6a3e1cc3f449998d05d4c68851a18c6d8dfc22",
+     "479ead11aa72d6239597873c2dbeb57840961d8d",
      []
     ],
     "forced-colors-mode-14-ref.html": [
@@ -327683,7 +329284,7 @@
      []
     ],
     "forced-colors-mode-17-ref.html": [
-     "5a5d7f980f4d1ea51b03c4ce26442f64956df517",
+     "125c4364129e81f4d1db3d22d8f76201a80f65c0",
      []
     ],
     "forced-colors-mode-18-ref.html": [
@@ -327710,6 +329311,46 @@
      "9792073004b07893281ec6e4d96f52fb0e3939a1",
      []
     ],
+    "forced-colors-mode-29-ref.html": [
+     "825f63ae85b2be93829f0fc3895d521e6e969250",
+     []
+    ],
+    "forced-colors-mode-30-ref.html": [
+     "6029573933b9977a8658d0204ef9af1efb5508a7",
+     []
+    ],
+    "forced-colors-mode-31-ref.html": [
+     "93d4045978f4f5af7ab2527a73689f6f19990046",
+     []
+    ],
+    "forced-colors-mode-33-ref.html": [
+     "ae7148ba8ed9c9700e6b8a00276551d04d76980c",
+     []
+    ],
+    "forced-colors-mode-34-ref.html": [
+     "b317d2f440c45346728d72b344d591f9ca613452",
+     []
+    ],
+    "forced-colors-mode-35-ref.html": [
+     "ba38e484b5591c28d2493362f2b3e1355fc8f0e4",
+     []
+    ],
+    "forced-colors-mode-36-ref.html": [
+     "838b10da953c32ef9088c19b6a061e9070210aff",
+     []
+    ],
+    "forced-colors-mode-37-ref.html": [
+     "a2cc4b7efee30d714f976b7250b7ad8cab6c9238",
+     []
+    ],
+    "forced-colors-mode-38-ref.html": [
+     "e72a73fcef72f1d7943fab1871b8715c4809f2da",
+     []
+    ],
+    "forced-colors-mode-39-ref.html": [
+     "df6de6eda257ecb027b8d861cfe3cb2a5ab3ccce",
+     []
+    ],
     "resources": {
      "float-image.jpg": [
       "ab06d5f94d16e22bb08fad79d6fef662b2a7de5a",
@@ -327763,20 +329404,20 @@
      []
     ],
     "generic-sensor-feature-policy-test.sub.js": [
-     "20436be80076abe3cedd22214bd176564af8ee87",
+     "da1af4132486c38af45dfbb44d0c902a6fc4ea6c",
      []
     ],
     "generic-sensor-iframe-tests.sub.js": [
-     "200013c48f983ed1aa5f48aa535d753b8a201f2a",
+     "3ebabad3a1073eda6103ed852ee8d6784a00c76e",
      []
     ],
     "generic-sensor-tests.js": [
-     "833bd0e73131edcf40125386549903cb31819cd3",
+     "26ff691959917b7b4921900f0603dcc23867c0ca",
      []
     ],
     "resources": {
      "generic-sensor-helpers.js": [
-      "c2afb400207d1ebf92c227522acec550e06ac8f3",
+      "40f2c906f6572b4f9723cce594d643419eb36e62",
       []
      ],
      "iframe_sensor_handler.html": [
@@ -327871,7 +329512,7 @@
      []
     ],
     "README.md": [
-     "a85911a8a09f74d393e44471b4bc4bc9eb890070",
+     "11e5bcf81c4069835a7f801dff75f287bfb2abea",
      []
     ],
     "browsers": {
@@ -329154,6 +330795,10 @@
         ]
        }
       },
+      "iframe-nested-print-ref.html": [
+       "c36c459881cb0a6c3d85fa20a20d39b1c2d30b3c",
+       []
+      ],
       "nested-browsing-contexts": {
        "resources": {
         "frameElement-nested-frame.html": [
@@ -330523,6 +332168,10 @@
       "6604450991a122e3e241e40b1b9e0516c525389d",
       []
      ],
+     "cross-origin-isolated-permission.https.html.headers": [
+      "5f8621ef83660c66f0d037ea28fafefb558140f1",
+      []
+     ],
      "data.https.html.headers": [
       "6604450991a122e3e241e40b1b9e0516c525389d",
       []
@@ -330596,10 +332245,18 @@
        "6604450991a122e3e241e40b1b9e0516c525389d",
        []
       ],
+      "cross-origin-isolated-frame.html": [
+       "b79fe288b3ba6de26ccd15947e8521839a18c62a",
+       []
+      ],
       "dedicated-worker.js": [
        "66f3cc3d413ec4f4ed3e92dd18081a59e2696734",
        []
       ],
+      "empty-coep.py": [
+       "d0e547b130db1307fe81589f7a2e3706fc1e65ab",
+       []
+      ],
       "fetch-in-dedicated-worker.js": [
        "bd60d07952ccbf2f4c6954ce65083ce0eada13f4",
        []
@@ -330936,7 +332593,7 @@
         []
        ],
        "reporting-common.js": [
-        "ece74ab269d057b74f44ba3de453627bd411b229",
+        "3b1820cebb8f1d5f8b7fb00b90740cee6de9fbb9",
         []
        ],
        "try-access.js": [
@@ -330951,17 +332608,29 @@
        []
       ],
       "common.js": [
-       "8a3cd133734dc38d18c190c77c8ebc947c260030",
+       "18656cd9e6e1e9376d256548d817666841d213b3",
        []
       ],
       "coop-coep.py": [
-       "e0a3d90050a6242580eeffd5bb6353055b3033d7",
+       "04b673bf2d97322b6558e966e1c3c646ba12c266",
+       []
+      ],
+      "coop-same-origin-repeated.asis": [
+       "082478e1599eb8974319a31334e41f46ab0fb91d",
+       []
+      ],
+      "csp-sandbox.py": [
+       "ed415c431eca429be27ef883e44405160bd1e28f",
        []
       ],
       "iframe-popup.sub.html": [
        "748fd996cfbb5dceec670033308fa68502d70cb0",
        []
       ],
+      "javascript-url-same-origin.https.html": [
+       "be2e59312b71ba72bb4636867b90b9557f6b5165",
+       []
+      ],
       "popup-coop-by-sw.js": [
        "7b16e3162713de8132886178c5c8be106e7ec712",
        []
@@ -330974,6 +332643,14 @@
        "4e798cd9f5d3f756df077a43ce9a1a6f9b41fd28",
        []
       ],
+      "resource-cleanup.html": [
+       "3ae5587c7d0c7740f7ff5e70059d61035aa6c592",
+       []
+      ],
+      "resource-popup.html": [
+       "f6b811407f1b0a728ff56252255916e61b0ad883",
+       []
+      ],
       "universal-worker.js": [
        "244167937219cfd784f13d8ed37eedead64665e9",
        []
@@ -331230,6 +332907,12 @@
         []
        ]
       },
+      "images": {
+       "image.py": [
+        "1aec081926317c158503e36a6ce073f51d6eb59a",
+        []
+       ]
+      },
       "requirements-relating-to-bidirectional-algorithm-formatting-characters": {
        "reference": {
         "dir-isolation-001-ref.html": [
@@ -335286,7 +336969,7 @@
           []
          ],
          "resolve-url.js": [
-          "cac16d0b492f2362b49625a9961dc6608104d8bf",
+          "01c8a59cd2f0ea40625ea97568cae27c8a057ca7",
           []
          ],
          "resource.py": [
@@ -335988,7 +337671,7 @@
     },
     "resources": {
      "common.js": [
-      "273f3a47be6707f3722922e34bcb272889636003",
+      "d23495ef8d18271e384c62f0076c4e4a2638e443",
       []
      ]
     },
@@ -337111,6 +338794,10 @@
         "ea80d8b545ff978775ebcff54b3083520bed8334",
         []
        ],
+       "image-compositing-large-scale-change-ref.html": [
+        "ab18cd24e44f288ca1c6f559152b7c0dcc732f78",
+        []
+       ],
        "image-loading-lazy-slow-aspect-ratio-ref.html": [
         "6de01a9b3bbf19567555af2524f8950abdfb2d81",
         []
@@ -337389,10 +339076,6 @@
        }
       },
       "the-input-element": {
-       "defaultValue-clobbering-ref.html": [
-        "5a396d3c52a9d80f76d2b35555410c787c083f4a",
-        []
-       ],
        "hidden-charset-case-sensitive-child.html": [
         "92c9981a1123454af8462cea7840a099721109a0",
         []
@@ -337485,6 +339168,14 @@
         "dbe4c05bad65080aae5edbf055bff2b5f4a72bc7",
         []
        ],
+       "grouping-li-reftest-004-ref.html": [
+        "2d9b19e0431e2c4d6ae1777081a4154d35d60660",
+        []
+       ],
+       "grouping-li-reftest-005-ref.html": [
+        "6ec02e5433ccabdcdd2b8d0c0f6e8cba6e39c625",
+        []
+       ],
        "grouping-li-reftest-display-list-item-ref.html": [
         "fb142f84b8308914946775874d4b8cbaef641a09",
         []
@@ -338169,7 +339860,7 @@
          []
         ],
         "evaluation-order-2-import-worker.mjs": [
-         "3d9c9bb74973244909857aa73804bf1e18faf112",
+         "81c9d0bd3e9d8ced90974f567a3edc1ef4baebca",
          []
         ],
         "evaluation-order-2.1.mjs": [
@@ -339696,14 +341387,6 @@
      "f27e1a262717ea1ed666f59035a88a1d481a7460",
      []
     ],
-    "idle-detection.idl": [
-     "066e1ede78dfeca799edeedbe1ccc23e8776798a",
-     []
-    ],
-    "mock.js": [
-     "d88d1ad1c55afaee243e1e9146827b073c380613",
-     []
-    ],
     "resources": {
      "idle-detection-allowed-by-feature-policy-worker.js": [
       "e643414f750897516db0576cd02262c3d571d4c1",
@@ -339713,8 +341396,12 @@
       "138b29173f73eaed62dc57f4c912d15c174f9a5f",
       []
      ],
+     "idle-detection-helper.js": [
+      "5d085461835c44090c7fbe45aab874fc9e9e7899",
+      []
+     ],
      "idlharness-worker.js": [
-      "6527dc45525adf276b87d8859f12d2c98e61d548",
+      "ba2ddfe169cf53fac64f5422dbdc7f6bab3b961f",
       []
      ]
     }
@@ -340446,7 +342133,7 @@
       []
      ],
      "reftest_match-print-ref.html": [
-      "71da5ffe1ebf2ce59215c9aa83a7ff2da52fcb91",
+      "5bc16469c81a386d0c066d0584571382f697d42a",
       []
      ],
      "reftest_ref_timeout-ref.html": [
@@ -340525,19 +342212,19 @@
    },
    "interfaces": {
     "CSP.idl": [
-     "e427ae8801a7863a59d9507d384e075e34bd4731",
+     "43ec3e4e87d142e110fb901a355a8b9c2e47bf98",
      []
     ],
     "DOM-Parsing.idl": [
-     "5020be899425be9bb32b4592a53bce76f8d090af",
+     "9971262922083000b944e0de032163ce77812041",
      []
     ],
     "FileAPI.idl": [
-     "a630226c3df3d3dd09cb5ef85435319fdd8ef632",
+     "aee0e65dcae267201bbe6ae8b8c90231795facf1",
      []
     ],
     "IndexedDB.idl": [
-     "8af2bbcf23821e34f95fe2cabdb3d3b3b91b3eb8",
+     "d82391da7e65ddd02ced4af0daa9a83c364a46dd",
      []
     ],
     "META.yml": [
@@ -340549,539 +342236,547 @@
      []
     ],
     "SRI.idl": [
-     "3abb66cd6e7c5b2ac76faf466924d44c1d2cafc8",
+     "78f916fe64d78a6314138f06d139b03cb1416675",
      []
     ],
     "SVG.idl": [
-     "63367fdc23e1d9836be45cea103463a43304d75c",
+     "f8d24c9c66636d411f31cd2f780b774ac636639d",
      []
     ],
     "WebCryptoAPI.idl": [
-     "d81a43ba0f92388ffd89f0808e32313c7ea58e56",
+     "9e0aed0f4b0ebd18e18ffdbc16ad680e3554cf5f",
      []
     ],
     "WebIDL.idl": [
-     "a118dfd1a20e439129ab5f73b15ced9523c8d7b8",
+     "5179d167038524b0d36c501ece0d583edb9e9088",
      []
     ],
     "accelerometer.idl": [
-     "f4187b601763a4f96ce9103ed49011e950bd97de",
+     "fc8fc07ff775ddc5c4c8eb1b56f53740d5043d6e",
      []
     ],
     "ambient-light.idl": [
-     "06d6eec690ba8c70ab10f61fe9a9a1de286b6e70",
+     "6d9c8e03eaa8182da19b8e3f96e8d0894d1a6389",
      []
     ],
     "anchors.idl": [
-     "159bfaccd55e2ce3a8fac7490db2fb0393c8f2be",
+     "6c07b434bf235e933586e4600232b9baede6579f",
      []
     ],
     "appmanifest.idl": [
-     "926a4fc2022e71c28aa4a2ae3d1adc12104ee1ab",
+     "8d701371f85e7cc5af9d6c3447d6577b3c746381",
      []
     ],
     "audio-output.idl": [
-     "2041e6ea8fdb5d2f67cf9596a71de4b290bee869",
+     "80ceb225308a057d99ce39f575ebcf8eb40ab5fb",
      []
     ],
     "background-fetch.idl": [
-     "cf3d75125402197f7b1a52b4a38fe9acc168643f",
+     "1a0ed0e43cfafa23e9e7e9574d449659d2762048",
      []
     ],
     "background-sync.idl": [
-     "c52dcdb89843e80e9bd89591df76ba26f7172dab",
+     "12707e9289a9d785997c87ea64fa145e5bed5d95",
      []
     ],
     "badging.idl": [
-     "01481820935a08675e4bef734aada27b3151e814",
+     "0b011a92f003a46df4219e528696003b40559fa3",
      []
     ],
     "battery-status.idl": [
-     "3f7a58b38be58135aca9791f1eb6422f22fbc1aa",
+     "dc85bff19e82e3949ebd23dbc39461c7000cef6f",
      []
     ],
     "beacon.idl": [
-     "c5e3465c59fcfadba79803f7baf1853c2c48e06b",
+     "103a999fd432707d8858e8083b7ef74b17396890",
      []
     ],
     "clipboard-apis.idl": [
-     "c99113059ec77b266911fe0ce2c2bf520444fcd0",
+     "81926bdd6a15ed7fc31f94b89538ff0b44b117c8",
      []
     ],
     "compat.idl": [
-     "fe77a2f942827c5fbb842db74556d5e8353a9cb3",
+     "8106c2d4e0599cb2383a32873968ffa5dd81ebe4",
      []
     ],
     "compression.idl": [
-     "47d2b9e48d06ae830ade5aef4b1c0914995a5e1f",
+     "d0cd635f2deefb3984cea9a80c777f537bbe5dde",
      []
     ],
     "console.idl": [
-     "3cd3c06b54b022c61857a6a29e8e97bf4fa9b47b",
+     "7cd73a61764fc178294a9aecec5f4781256deec5",
      []
     ],
     "construct-stylesheets.idl": [
-     "35121866f66eaa8b6663480d1a4cb72c1cf8fd1e",
+     "7b65cb98bddc5a7fff9d3ced40ed395003337f72",
      []
     ],
     "content-index.idl": [
-     "5b4a8ead16cc6be61bf325092121638244674073",
+     "4cd44f536d751c3925368d2646b6b019467605bc",
      []
     ],
     "cookie-store.idl": [
-     "bc2899bb4fc7eed67d2b76e7b83e3ec7c9c0dd60",
+     "cb59e74b93a36aa1a49db6cd281602f3f2d89780",
      []
     ],
     "cors-rfc1918.idl": [
-     "6b3954fdedf5b1786f277964ec9e4d27c31401d8",
+     "083b6c3d630bb8179c1376d49bd13d48235bf6f8",
      []
     ],
     "credential-management.idl": [
-     "d097dd084b64dcdd1776a2bb86809e50275d337a",
+     "a2b062a7ffd864c32e43f161a40fdcfb058e9bda",
      []
     ],
     "csp-embedded-enforcement.idl": [
-     "167bc96eb53c5d1e67f34b1cc39622a30d30a7f8",
+     "a980630bc18c3dc15b85a88617f01953bddb1ed1",
      []
     ],
     "css-animation-worklet.idl": [
-     "2c46cc7c94c65d6928db9f4e90a57c6188815d8e",
+     "82d34a3ea2a2dafb82abc7d1adfdea4641e826de",
      []
     ],
     "css-animations.idl": [
-     "9b34bde2330497afe6628da8e01946c27cf89821",
+     "8185170943281bd1ceb8bb8fd3cd701a60fa290c",
      []
     ],
     "css-conditional.idl": [
-     "a57cc6c205e290fab1244e7d8f5ef087011b6800",
+     "16f25583be97cfce8d4178fa68f43518e51195d2",
      []
     ],
     "css-counter-styles.idl": [
-     "5ed4d61e2a46698138e57c759ee65ba3d724e31d",
+     "86c89e1eb2f8429ada052663eed2fd3412f437bd",
      []
     ],
     "css-device-adapt.idl": [
-     "8166d2e75f954aee86221c98f8065e30a7ca4467",
+     "bfd4a6d247d42282edcf77e0f57d965df1e5d252",
      []
     ],
     "css-font-loading.idl": [
-     "936ded788bcbbf38b71be5d58e886059245b6b89",
+     "31d247e9df25e143c939275abd310745eb57de72",
      []
     ],
     "css-fonts.idl": [
-     "42e88e46c54589b8734263040e7b32217a1881b5",
+     "7282bffee8b3e01f29cfabb49f1eadc31801feed",
      []
     ],
     "css-images.idl": [
-     "62e0480f8efab78b0710acb5b1031cfb5aeb52ee",
+     "8866b008ccbf7dbca9d8e631da3f26013915bf00",
      []
     ],
     "css-layout-api.idl": [
-     "31ab6eb4d0b2a8eab1acee7ad1f6f9f69e89a69f",
+     "f6ac4c17e27fa7df237229eb2fcec770dba22324",
      []
     ],
     "css-masking.idl": [
-     "6db59eddbe087310010be1e60b826b72924c7849",
+     "72fbd9aa1ffb576802102a82bf97259e3bf60078",
      []
     ],
     "css-paint-api.idl": [
-     "c636e2e7d3771fa4d0fb0df06088885552da6e00",
+     "0924c535566779e4f20ee89360df3c334943022f",
      []
     ],
     "css-parser-api.idl": [
-     "f3e586785dc2d5d86b489715e4981e517304e7e8",
+     "ddb0c0d5ebbd1bb2b8c9cadd16d4e9b883f4462c",
      []
     ],
     "css-properties-values-api.idl": [
-     "d8f54b1e15bc020ef101ab53626eee6985c63dcb",
+     "eb7d7b027e72d9347c319c5d02770bf5e600b4e7",
      []
     ],
     "css-pseudo.idl": [
-     "2b557e653163863feffa05d3f4a4e961142aa944",
+     "2c90ff2b3174eea5d1245214b79ac79ac2479ee5",
      []
     ],
     "css-shadow-parts.idl": [
-     "c470e8e7dc8a71f07870afdc78989b477afa874b",
+     "b7ad99671ad9031571e772bf5fcd307012e6ad94",
      []
     ],
     "css-transitions.idl": [
-     "15ce4b30f211012b5fd9e6a713d92c0ea1045a54",
+     "174bf209f131ec9cb706e3d2d2d2ea4c1b70bcc7",
      []
     ],
     "css-typed-om.idl": [
-     "00d3f49bfe653ce4782e13e6c0d46c65783874cc",
+     "899ea97f0ddbc94207338492aa341af2f7eca016",
      []
     ],
     "cssom-view.idl": [
-     "82517fefcc218ce1abb41169d45e6aefc580ca6d",
+     "f998758dd32c6a48edb42b918f4ca830d4093f14",
      []
     ],
     "cssom.idl": [
-     "b7d9c33d596c3882e14ffa2fa1dee99e087ecedf",
+     "9a48740de450e54f8370225103d701f747104dce",
      []
     ],
     "custom-state-pseudo-class.idl": [
-     "8fcd287acd337664d0878aaaac46453aa54f224d",
+     "d4e3da7e6a1a9e7763bde6b13c0add204ff3c7de",
      []
     ],
     "deprecation-reporting.idl": [
-     "e62711936b5ec9e6ee93e85c3e52e07462406957",
+     "72622becb2c5e4f1b7ba4acf66815e01c659e32a",
      []
     ],
     "device-memory.idl": [
-     "f664013ddefea7bc8950f7604c06f53c1c1aac48",
+     "3be709e8a206247404798d7ac8ce1bea027ba015",
      []
     ],
     "dom-overlays.idl": [
-     "958da865118d5fa76ea42adc678c877c5d06ef84",
+     "5e358c233c3a6d3029721e29a4d719e0748bd53b",
      []
     ],
     "dom.idl": [
-     "102c23123819ba2e9b633755cfb453b1f2168961",
+     "ffc5b063219d4d41b07ca1ff087fb118ed030117",
      []
     ],
     "element-timing.idl": [
-     "6a54bbd2af6952ff51b37907f866e7bdd770257a",
+     "70ca384894ff19880fbf0fd7c3545448fd348c53",
      []
     ],
     "encoding.idl": [
-     "d00624fa1ed7edc5b6f740835147c62f27631359",
+     "bae48f11993e5f26545e5ada9ca8e34bdb7d0fe4",
      []
     ],
     "encrypted-media.idl": [
-     "5d6bbe36ce38e7e91ee0f0364a161cbed16e7579",
+     "0a43cb7481b0a790327542c6e0694496b86f527d",
      []
     ],
     "entries-api.idl": [
-     "52693138a4cd9d86f9a48a8e5300a8006298defb",
+     "cd536bc698896c94d038739a915e758abb368f38",
      []
     ],
     "event-timing.idl": [
-     "d84d7c32dcc2a0e9745a6c60a7ac5dedac78b2d4",
+     "492c5ce01218c78543ced4e46b62559544da61dc",
      []
     ],
     "feature-policy.idl": [
-     "f59f090769e631e2fe259ea84b46041d79606ea1",
+     "4f22cf299430062fd0bb6cb5483b011750a692ba",
      []
     ],
     "fetch.idl": [
-     "1d8a97ef940187ae4ac60fe93bb05d4b7beabd91",
+     "a9304e90ef886bd9db5356258e84f700418d4393",
      []
     ],
     "filter-effects.idl": [
-     "718dcee7476706fd9ee3a3e496091731252e7d07",
+     "b17ebf67890981804f7a0fc657fb77a9f0fee748",
      []
     ],
     "fullscreen.idl": [
-     "677b2e116f6dcf6ff8340761d473e3dcf0f83af5",
+     "2f67f09a39406c06c440b2343ed5f36141fbf48d",
      []
     ],
     "gamepad-extensions.idl": [
-     "f2a2811b4b45d6175c6502deabf4411817484412",
+     "2d353b061c4b728ce61e61ed4be1f5981027865f",
      []
     ],
     "gamepad.idl": [
-     "27541bf2553520dcf7f2ce52386014c9a4363377",
+     "c8a2fc590a84937912f873a15ef666ab55013c77",
      []
     ],
     "generic-sensor.idl": [
-     "f3eeb9bf968f7a1a0ba6a772ad935b855b1e9e8a",
+     "157072f6341821aba5403be50ddd5355dbb940d8",
      []
     ],
     "geolocation-API.idl": [
-     "8bce6413816583e40feb941c4903d7be9346c8a2",
+     "15bb7349dd373592eb9388d30477162f2a2ce720",
      []
     ],
     "geolocation-sensor.idl": [
-     "baa0f5c7a1e78a2e2ee9772ffada53790116cd55",
+     "e1d676205fff369c5cdc656f8563e4bb1fca9946",
      []
     ],
     "geometry.idl": [
-     "ada6c0c302cdff87a78a0e8ec5ac25a8f0e64922",
+     "a1159c0d77a3f6f9c302d4c70c185a4130e2b383",
      []
     ],
     "get-installed-related-apps.idl": [
-     "cbea101d300f0082d7d020809c9c2da3e581ad90",
+     "e096044c2bcf966a72324af6157d59b62d862338",
      []
     ],
     "gyroscope.idl": [
-     "3754fd81e6bf605a308794e5b759ecd8784a6a15",
+     "00fb0efcace7c388743e615ff301e8279e0532b4",
      []
     ],
     "hit-test.idl": [
-     "d9f90b3ec7b20e74dd205142847276e37a4b5f0a",
+     "14f1ea7c91cd5fd09ee30e7ffaa79ef886c56ded",
      []
     ],
     "hr-time.idl": [
-     "8179c66f44de27acf4d099ec2a213f7623cbcd6b",
+     "93537d64ad18d7079242a32e53510ec20b5820e7",
      []
     ],
     "html-media-capture.idl": [
-     "3a8c12165f50087bc1bf955b4e1ef91c5d274495",
+     "696dce6789f72735e457eea44b51c3b1133d103c",
      []
     ],
     "html.idl": [
-     "09e1a29043b5bb56b3366d2cbb13b5e834424121",
+     "e92bb8690dddd30b0c563a6e25114a96e7d98e84",
+     []
+    ],
+    "idle-detection.tentative.idl": [
+     "066e1ede78dfeca799edeedbe1ccc23e8776798a",
      []
     ],
     "image-capture.idl": [
-     "f4ad3705f04b972b82672b9c0db66b86e6c8a581",
+     "f98912cb6a169e734d6fc01030f213fa9a6eaba2",
      []
     ],
     "input-device-capabilities.idl": [
-     "36fdbd21c4226b5c2cb5a7f30c32561c877e20c0",
+     "72d91de2fcd86f8c244329141598eba31535e9be",
      []
     ],
     "input-events.idl": [
-     "5ddaae5b9d3db83caca699c847373e7deb421ac4",
+     "6a2147b93e640109a1930cdc23279138c216c4ed",
      []
     ],
     "intersection-observer.idl": [
-     "46fad3522ed2539d04a688cc4f5d05c8e76ef24f",
+     "fa1de190387ec62a2c86aba97a0002f4db4537db",
      []
     ],
     "intervention-reporting.idl": [
-     "95905fe3b58ec9b38ad26671dda1f68519b887ad",
+     "3c3b8001e740d21ca9d2f5cc2d6ba09ccf2eeb9c",
      []
     ],
     "is-input-pending.idl": [
-     "191fafdb96c8c7502e5a297719562053cf23907d",
+     "a0314781bb1ca116f2c6d4600d5b463420717950",
      []
     ],
     "js-self-profiling.idl": [
-     "0153e652360e2586a11ba6d808d38bfe59fe159e",
+     "2c51c1cfe8eed10c8bd92bae1fdf3bf4a9216995",
      []
     ],
     "keyboard-lock.idl": [
-     "5990976c1c8211560e4dd5bbe87811d1bf06d9d0",
+     "1eb2e97e2707626392dc895de4cd1499653c3dfe",
      []
     ],
     "keyboard-map.idl": [
-     "70aaaffd3cfb5781b77f92eedf57bd4205e308bc",
+     "8d95d8850582674bf8083b8aef420a46fbc478a7",
      []
     ],
     "largest-contentful-paint.idl": [
-     "d3cfd56bafd171fb5820ace2c99eaa4e1a09b45a",
+     "99de275cfd3e67bb5972c43bb1f320912d98fef4",
      []
     ],
     "layout-instability.idl": [
-     "3ee0afa061028ecbf99f94e9479e412a169184c3",
+     "4fb1b70398e7486a0596574b3ef76d361806e0f3",
      []
     ],
     "longtasks.idl": [
-     "ef3f660038bed8cf7064d51f7e261af11532df9c",
+     "6ceb0e5d8f050f231211aae4056efd2762852971",
      []
     ],
     "magnetometer.idl": [
-     "da1f22bb6685a38164c1eb16d3a6c07290e7833a",
+     "45ba9edcfe570c5d1828d089409e8220788c7e94",
      []
     ],
     "media-capabilities.idl": [
-     "02aa140bc085296afce1e75b2a02408262c4540f",
+     "fb52b7c417c10ce295d5e528dd8f60b69cccf90f",
      []
     ],
     "media-playback-quality.idl": [
-     "c3ee5237e4ca43656807dfdb36c3fa9c5d7344a8",
+     "f73d8dbd59851765b8e71a9413140e6b30aa86e4",
      []
     ],
     "media-source.idl": [
-     "e6ff4cd6ac378b2db9ea2f5063cc7293b9f471c1",
+     "51eccd906e74bbe7a9aad42817c730c29c281d79",
      []
     ],
     "mediacapture-depth.idl": [
-     "4d7459bf207134151b4169355f31802f2665dd42",
+     "dcf3c3659d97b63bda5b53d64728b2e361e49bf2",
      []
     ],
     "mediacapture-fromelement.idl": [
-     "7e11909509578ddc072319b455d0a5bc199ebbce",
+     "b25f87018df5202950ac90da8bb140c6d2d5e7f9",
      []
     ],
     "mediacapture-streams.idl": [
-     "e82bf36f3d79028dd21ff225c5ee46c9e1578b0a",
+     "5532cf64671295ca52eb9904450c683ba8b14dd5",
      []
     ],
     "mediasession.idl": [
-     "059d1ec8cf14c80fb78285b5014bd3a3e8c7e664",
+     "c2b2e0589e1c217a2e108f8b12c25ae2f2ad3998",
      []
     ],
     "mediastream-recording.idl": [
-     "52295125da66d8562f66366f279d57ae05a7fe86",
+     "c5347959383d1fce74a07be9b2709cac8f9ea5b2",
      []
     ],
     "mst-content-hint.idl": [
-     "f7d3f20e72364a1bf7df019e3115c34c10d811ba",
+     "a41abb55eaeef0abc0695384477f1cd63ddf78ad",
      []
     ],
     "native-file-system.idl": [
-     "1fd2cb8b3a1da36a1b403c7e8970a4e40dc7beb2",
+     "92ca66c82e07fb24f72eab4973b6fe13beac0e7a",
      []
     ],
     "navigation-timing.idl": [
-     "57cea306d9e3b50b269587444ecf4c5190e15de4",
+     "9b0f784231731ce583e2f18290a93303bfa56be2",
      []
     ],
     "netinfo.idl": [
-     "530deb998c4656a4fda32af7f6286e895a15e082",
+     "ac5265dbebcac2851e047088d5ffc8f7ab256965",
      []
     ],
     "notifications.idl": [
-     "d79e9076c81c9f1016f1ca98c16356f6b9454365",
+     "f0488cf8455d2c413592fc7e40f96783bb9a4428",
      []
     ],
     "orientation-event.idl": [
-     "af5bc546ac1726ab610285bfa007df3b4e39bf11",
+     "4cd4356d2bbf74af5c943069917c3836d270be9d",
      []
     ],
     "orientation-sensor.idl": [
-     "2ea3d38240e527f10af7ef392e0c0935a3750572",
+     "5172c87cd4e2c2ef2678bff956c3356c3d162e43",
      []
     ],
     "origin-policy.idl": [
-     "e48e0632bd89ff764fa9b3864207b39723a388cf",
+     "0820e2ee567e8bfe93206f985900afa832bf9b67",
      []
     ],
     "page-lifecycle.idl": [
-     "f3d9c1f3f5647539aa840650befb26e76812083d",
+     "26de11c23d0c160f383fb2d6513b6a2ffbb1c6bd",
      []
     ],
     "page-visibility.idl": [
-     "6b8bd52a047ce411b968a79e6d0f7d152ab32a57",
+     "1c638f343030d16df628f89a630ddd2c30ac1a41",
      []
     ],
     "paint-timing.idl": [
-     "0bfb422f88872004bf9b189188dff366a123405a",
+     "052b74ef6c26dee833ac0980c79efc198a3f4d98",
      []
     ],
     "payment-handler.idl": [
-     "66732945ca67f638998da5771ae413b8fb76b327",
+     "259549a503d477cc4a099f105014faaa1f1de11c",
      []
     ],
     "payment-method-basic-card.idl": [
-     "72e0555066cf41068f907d4c5e33ce86443fbc5d",
+     "813fc6eabf970cb3af1953ea60d3fff5c80a4e14",
      []
     ],
     "payment-request.idl": [
-     "9407c711e48ac8403bb23f5d821d744b3e7fc837",
+     "91aab8f112be0991dc229de99158dd146ca2c6b7",
      []
     ],
     "performance-timeline.idl": [
-     "36107ddeea296df350a2f4da33fcc396d203eaae",
+     "34f62a37823f30360ca94b9d8f695668f3ac0969",
      []
     ],
     "periodic-background-sync.idl": [
-     "14ee8bbc30df1e6fd292db7e52504a2d3ce84d5b",
+     "37a58ba1495805e08724cdcb7f37527cbf224821",
      []
     ],
     "permissions-request.idl": [
-     "08431fbab85ab9838278c2e2d0dd9ad411f1d5de",
+     "e189194dd0bd92bb833c39b15b89bf243cee2729",
      []
     ],
     "permissions-revoke.idl": [
-     "4c2bcf7b99f14b58ffea738a23272767f4ae686f",
+     "5e8f386cfbcd2172b3e9801cdac4bf69be337567",
      []
     ],
     "permissions.idl": [
-     "d45c7f93cac7683a76e89d0e7f429f5f3cb695d9",
+     "dfc934f9ce399edb7ff8be0b293316b5f7bbeb32",
      []
     ],
     "picture-in-picture.idl": [
-     "195977335603240eeb9f4b1391a5b2e6aa3c2441",
+     "19a3608b4b35b6aca3ed6806e3249b78199ba021",
      []
     ],
     "pointerevents.idl": [
-     "e977ce734205fe8ded6524d35887e036c2895322",
+     "6647589dfdd9006553fab0fb5e41f42ea8454ab5",
      []
     ],
     "pointerlock.idl": [
-     "12e984b33c6a2a88d60d2953259f3beb6f7a0574",
+     "7670ec76cbdde325cba22ad2ed8ebf81eb7e17bd",
      []
     ],
     "presentation-api.idl": [
-     "dfaa022b95249eb020e6fb8e0495156a8c0744ee",
+     "0757e9b8bf203ad2f5a3ce783f1c1468464a7828",
      []
     ],
     "proximity.idl": [
-     "d4c8fae3a5438058262108f4848414763138080a",
+     "9ca71e010814fa2835d9b128b4f190005fc31ea4",
      []
     ],
     "push-api.idl": [
-     "419fe25e08b95eb45b0bb5da7e0aceb18163c1bf",
+     "07868235be0d939a85185c4b8c447a31f2e68bcf",
      []
     ],
     "referrer-policy.idl": [
-     "962f7143a9e04402a717299e1a657d04b2c16f15",
+     "0ef9a1fdecc87241a536df9f725f3d7e2030d3e3",
      []
     ],
     "remote-playback.idl": [
-     "2b0d85316c20bbcbfb2c969c4d24144f01d39ae8",
+     "724f3dfa8d2159aaa90546c5e6787f54daa3b0ef",
      []
     ],
     "reporting.idl": [
-     "d42f0bac59c2fa6d8f94402f7b6e1e29de379123",
+     "150f30d03bf89d1ee557fe395e23ebb443f91493",
      []
     ],
     "requestidlecallback.idl": [
-     "c763b50bde782bb484564b49e25068fff88f782b",
+     "fc21145eabc41f4a5592f615838b8d4d8786e353",
      []
     ],
     "resize-observer.idl": [
-     "f20b719d11e76cf92997a56061d0091895453f52",
+     "0d2aa2863a79409e4904c35f2754f644aed9e0a2",
      []
     ],
     "resource-timing.idl": [
-     "cbc17683b260708656e6e75bf801107baefd907b",
+     "112266865bb8c5c2dda4a3b76ea4c0be9b7c7749",
+     []
+    ],
+    "sanitizer-api.tentative.idl": [
+     "25cba22ecfc4ee194cf4f21aa2c0d24c7c16de05",
      []
     ],
     "savedata.idl": [
-     "4d9e3b98d3c993cf2e95a5eaf363f38c5ec32941",
+     "f1274b8ef74c35804a72237b579c5e28dc9d3c1f",
      []
     ],
     "screen-capture.idl": [
-     "4936ee9a519562d27531e7a4eeb28b76322d9486",
+     "7786b7fb4d7c9affd615bef5c7c51c22a8f9d8e9",
      []
     ],
     "screen-orientation.idl": [
-     "b5481216729526387722a6c733ea529f5d1f831a",
+     "9e9dbc67ba73753851f158340803a62e0178e893",
      []
     ],
     "scroll-animations.idl": [
-     "782d08f4c404aaad54599e754367c42526825bde",
+     "df35313b48a4305f9249d9faa183081bb83dd5e0",
      []
     ],
-    "secure-contexts.idl": [
-     "c177b27a012889a49ac034172bf3ddcfda95fde0",
+    "scroll-to-text-fragment.idl": [
+     "ce571ddd694d4ecbb1024fcaf7f11dc805504bf2",
      []
     ],
     "selection-api.idl": [
-     "63c96169b08c5a6b4fb4cab3470c71ed08e567d0",
+     "b6626292183422e7961f53e757e062448ae3df72",
      []
     ],
     "server-timing.idl": [
-     "bf7488d2ceec4390d907486dbf19d3b68474e382",
+     "ef2a761dfca941253f0a27de5f802a9e55348dbb",
      []
     ],
     "service-workers.idl": [
-     "3d5e63a81204baa3099a2415be3a73d369aa31e3",
+     "aac74741a01b74ae4269afffec92e95f9a99486f",
      []
     ],
     "shape-detection-api.idl": [
-     "5b1c45a773987eb8ce8b59fd5b98c2f0c9ae4ea5",
+     "4fc1f085ea2c24b73a9fa5f7d706d87fedf225a6",
      []
     ],
     "speech-api.idl": [
-     "0aad231d344623f91dd15c124919023297bd3867",
+     "74085481525c943296f023e94a6532e5bc9f5b15",
      []
     ],
     "storage-access.idl": [
-     "18dd08f7c29e73cc07876a65e30f1268d4ee158a",
+     "fff583e0982399d7ebdd001653d4bf338a14243a",
      []
     ],
     "storage.idl": [
-     "437bc6dd43c2bd17113c6b823a238e7141fb25bf",
+     "d47e37c40e88e4e448f25e4044359fd87ffecad7",
      []
     ],
     "streams.idl": [
-     "f96c196385ce76d442a6d42838f021ff56dce7f8",
+     "1df6827189d137d8ce690073f6e626eb186bc539",
      []
     ],
     "text-detection-api.tentative.idl": [
@@ -341089,7 +342784,7 @@
      []
     ],
     "touch-events.idl": [
-     "84c48284a1b9bdcd79954008decdaeac9d2bf2eb",
+     "653414fcaaa4039b21589fec5c26bf90e0ffd5a0",
      []
     ],
     "trusted-types.tentative.idl": [
@@ -341097,143 +342792,147 @@
      []
     ],
     "ua-client-hints.idl": [
-     "14e941bd4077dd9e43747b02909793904c273fe3",
+     "6e59d8e1fef5e34d94fe71a41f56a826a2c35981",
      []
     ],
     "uievents.idl": [
-     "67405ebf118b4b584d9cc335918bc45eb3e5907b",
+     "d5506ef7781fe0b7b735991116e53c8119b55b91",
      []
     ],
     "url.idl": [
-     "b0b237e8524a8621f0ddcd8367ebad6fd5f2fb5b",
+     "b00ab4b83bc60bd6454fd9992ebdfd59264cd0e3",
      []
     ],
     "user-timing.idl": [
-     "8af17fdc03fd8bd174dc428d32bf49a23447c1e1",
+     "28ee8aac2b19a669a249fdd88b9911b3832bb622",
      []
     ],
     "vibration.idl": [
-     "cc5cd194b558952dc5791b28ffe9a1d03bbc004b",
+     "22ab1c47df0193cca84ce1a6e99368e5d80bca3e",
      []
     ],
     "video-rvfc.idl": [
-     "a86e2b364df0da0326ff1154128a9198e7b23e89",
+     "4c76b8e7d4f75e40b013adc3c6a6ed8f8585a0b2",
      []
     ],
     "visual-viewport.idl": [
-     "5e4b54136940d4341d97e73383144e3b79477b7e",
+     "c66e85bdcc1f9fc394bd859a572efdc3ecad0266",
      []
     ],
     "wai-aria.idl": [
-     "5b1bacc932ffdafffd6869d50146fb467ffc168a",
+     "557d8a9895712960a1143d616d3051bfafcf1fa8",
      []
     ],
     "wake-lock.idl": [
-     "1eb30a06024713e5aab435610a8fc62841db8a50",
+     "56bc8f43e4d08ad81f48eff802f46f7951cbe0a9",
      []
     ],
     "wasm-js-api.idl": [
-     "cc943610145dec2346e7ec9d6891cf32859f9d59",
+     "71d7207a712161d34e5dbe676991dd8c01aa7c06",
      []
     ],
     "wasm-web-api.idl": [
-     "23856007a6d8749004122c7f0c10acb879c2f24a",
+     "088c8ee3a3994eb2b39cb708792b5936ce331b16",
      []
     ],
     "web-animations.idl": [
-     "2f2b086e65cc981d47def182b46ad48ebb28f846",
+     "6e973d195e382d12b40f831146b9cb7edda06b97",
      []
     ],
     "web-bluetooth.idl": [
-     "73371e26996568e9051990fbb67f1e08deaed5eb",
+     "83071f368f005c0482c9e0d04071894c793826a3",
      []
     ],
     "web-locks.idl": [
-     "83905d64fec095750d270f3dba43fe937e1fd119",
+     "a0319a00fd208a8bdeecd9700e00fd0d67549a60",
      []
     ],
     "web-nfc.idl": [
-     "f2e31b7352867d39edc9c43a4f1fffb3a02cb985",
+     "5a56612db03e7c4e2d5c2136a29cc28008d43f00",
      []
     ],
     "web-otp.idl": [
-     "023de3259316a7b9124a8b959b57620449677418",
+     "77627dad138ccabd4fc520b4c6a479ca9f38da91",
      []
     ],
     "web-share.idl": [
-     "b66bcd81fe9c951c2e70a58596380353b7046d97",
+     "4d17f5bfe54beb765c00c21f3ad28c6bfe4ed621",
      []
     ],
     "webaudio.idl": [
-     "f0a5c7a9020b1eaa0af6df3664c41ecd03f71082",
+     "d869a978e34da5c5455fe4a99d60841187280474",
      []
     ],
     "webauthn.idl": [
-     "607c4765485041e5a8e5fe65571469bedf1d6fd0",
+     "27638d0ed40ba52f6bddda6be33f4e22a3dbe03d",
      []
     ],
     "webdriver.idl": [
-     "3ab991ba4e1b91c155944552332ddd9e4218b40d",
+     "194e2d806adb2131f7cdc56a70a46d7784cb7d75",
      []
     ],
     "webgl1.idl": [
-     "5edd66e21d039cde3029b8756ff4bcdfd8aaaff7",
+     "95a0fa342652d5ed76ad567f2a5437b7c888f7e0",
      []
     ],
     "webgl2.idl": [
-     "be9365e38936fd414c47ef3ae95772742a658176",
+     "b2e660e6b6545f33e4acb6e378bce3517ab4d4cb",
      []
     ],
     "webhid.idl": [
-     "9136e128cd53cc204f62ac1e9d2711d4bed1b201",
+     "38d917e1ec03512c4ac933be1ca7aa35be1074e8",
      []
     ],
     "webmidi.idl": [
-     "0e390f8bde70934d9934714d8c6853703dabb2b8",
+     "cf08897e99e8f493bc7e44d301dc7cdee75656a3",
      []
     ],
     "webrtc-identity.idl": [
-     "28b6a3b2b7f4acf78fde3889c75d6f8e97c8eb57",
+     "2af476f4d77b06c50857aec57e91a680e71da129",
      []
     ],
     "webrtc-stats.idl": [
-     "5a4838f9263fe2d41b993c0bcdfdb2d249f67d0b",
+     "455ab8f18a352368bb71fb275eadaa8e20e8664a",
      []
     ],
     "webrtc-svc.idl": [
-     "2691a87b30d39d7db42e29e04964fb4e8f7fefca",
+     "45469d79467dd9488d5b13b7b2407b25142d0d10",
      []
     ],
     "webrtc.idl": [
-     "efb21f4a0cc55c336c0c145298d463d0263aa575",
+     "841a8b53eaac99437b2baabb3e3efc10da7aa0a0",
      []
     ],
     "webusb.idl": [
-     "ad5c480454d7cd6feb178fa450663b9977eb51cd",
+     "44a8bdd04d5616b3ba77db8011c93db97ef925e0",
      []
     ],
     "webvtt.idl": [
-     "81a23a35be6f857e49253d47cb9c64d24677b56d",
+     "eb8d5b5c209a09607a02e7b32cc7e12ea6e27651",
      []
     ],
     "webxr-ar-module.idl": [
-     "097469d400d3ef4b7030c75a80c17b6fc9e797f0",
+     "c3677fecdce9c85e0bf0fd24863813dc1042dadc",
      []
     ],
     "webxr-gamepads-module.idl": [
-     "3aa17a7fe0c8020f6101c0fee29107ce7b24cb37",
+     "f623c632bcef236a4d5872914778d6f25375ba14",
+     []
+    ],
+    "webxr-hand-input.idl": [
+     "260c00365ac0d225e87eb01cd31f0bbd00eafd5c",
      []
     ],
     "webxr.idl": [
-     "b0d94394b5bb619198da1500cee1eb83785f6c66",
+     "81e42e908cb9368dc05bc176bb3ec6fb9613dade",
      []
     ],
     "worklets.idl": [
-     "f89eacd50bd58c02860c84b6e4c486ab978a5018",
+     "8f5154e8509e41ac4dbb761319555897aad8a8c8",
      []
     ],
     "xhr.idl": [
-     "d3d0e5378d367110b2e75120877b7cb1e38babb5",
+     "d6d8193e1c36b71bd09c9cedf1b72fa4365d50c8",
      []
     ],
     "xslt.tentative.idl": [
@@ -341297,6 +342996,26 @@
      ]
     }
    },
+   "is-input-pending": {
+    "README.md": [
+     "7994b1a4ec36302942d1a6e6809e15505b727ed9",
+     []
+    ],
+    "resources": {
+     "blank.html": [
+      "f27d7148d3ff65b3c9f203c7c622156c1ea7547a",
+      []
+     ],
+     "input-onmessage.js": [
+      "eeaa82841edff0e62dd60a52b483c7bc4158c85b",
+      []
+     ],
+     "pending-input-utils.js": [
+      "489c16827a111a561eb1c2cccb72a4db526ca3e1",
+      []
+     ]
+    }
+   },
    "js": {
     "META.yml": [
      "d4cbc628516bf0d2694b6a420d81a6d05e0eee0a",
@@ -341314,7 +343033,15 @@
      "Promise-incumbent-global-subsubframe.sub.html": [
       "9edd9d278ab58e706e09fadae6c4c933aa9e87f4",
       []
-     ]
+     ],
+     "weakrefs": {
+      "resources": {
+       "maybe-garbage-collect.js": [
+        "b7a3431f7bf02e9f2a07668dec7c50430842df8f",
+        []
+       ]
+      }
+     }
     }
    },
    "keyboard-lock": {
@@ -341422,7 +343149,7 @@
     ]
    },
    "lint.ignore": [
-    "a17a09402e01ca07a56b8270d1ec45f745377544",
+    "a3b91f1a9925956b78238e5c81904cbbfeeff8ef",
     []
    ],
    "loading": {
@@ -341686,6 +343413,14 @@
        "cb868d2400e8b8e536e3103a06a5d4502b1dbfba",
        []
       ],
+      "mo-not-in-dictionary-lspace-rspace-ref.html": [
+       "3938db19a7018537c4c7e9f0395ffdd724a6136a",
+       []
+      ],
+      "mo-not-in-dictionary-movablelimits-ref.html": [
+       "e7ffc78994702450fd9fec106e026aa2259547e1",
+       []
+      ],
       "mo-paint-lspace-rspace-ref.html": [
        "da0b79ff9a67cbe53daeb141aaa2efd4f2eb96ad",
        []
@@ -342602,7 +344337,7 @@
     ],
     "resources": {
      "imagecapture-helpers.js": [
-      "8252f42a637eb7f9c24917d63113f0adc1bf415a",
+      "8301b1c2b64ad5567d13b33be7a37d04ed89fdaf",
       []
      ]
     }
@@ -343014,7 +344749,7 @@
       []
      ],
      "message-target.js": [
-      "ab8012dfca5ae7117fda1e7c06a10041f2750d9a",
+      "98c726eea06610f84ea84f02b8706dc873094575",
       []
      ],
      "messaging-blob-helpers.js": [
@@ -343034,11 +344769,11 @@
       []
      ],
      "opaque-origin-sandbox.html": [
-      "e2d57a339992a176dfcdee9c81366af95168c07d",
+      "63ada267d8cee589989bc7758b0b5378e6af91b9",
       []
      ],
      "sandboxed-fs-test-helpers.js": [
-      "e3c18dbecec93f701531f57434b13cb395681828",
+      "a7506b6b2f3d10c2709d161d9e886c748b63f3f0",
       []
      ],
      "test-helpers.js": [
@@ -343136,7 +344871,7 @@
     ],
     "concurrent_io": {
      "operation_helpers.js": [
-      "76804cab72dfa3d2ed977d437bc7499046059706",
+      "d85a153bab1dd2ea971997f88a3b146be85aae25",
       []
      ]
     },
@@ -343338,7 +345073,7 @@
     ],
     "resources": {
      "orientation-event-helpers.js": [
-      "3f81fec5867f7f05ea1dbfafb091c9a0f5da563a",
+      "51154ad73765e498650f05e365837fe7fe30fdba",
       []
      ]
     }
@@ -343451,7 +345186,7 @@
      []
     ],
     "README.md": [
-     "8ff8de614fd6864458398d188fe0cb222fc6c967",
+     "693ab4048c0736b4d3072e25d2874228263bda3b",
      []
     ],
     "about-blank.https.sub.html.headers": [
@@ -343459,7 +345194,23 @@
      []
     ],
     "getter-special-cases": {
-     "data-url.https.html.headers": [
+     "csp-sandbox-no.https.html.headers": [
+      "4705ce9dedeeabf8208bf602176511c0cbe2cb76",
+      []
+     ],
+     "csp-sandbox-yes.https.html.headers": [
+      "3fd1539d4aec261080c0f4a1cea1fd98c3ae9196",
+      []
+     ],
+     "data-to-javascript-yes.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "data-url-yes.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "javascript-url-yes.https.html.headers": [
       "ea3f6b335c7620acf59f546fd48484bf624ccb38",
       []
      ],
@@ -343467,7 +345218,37 @@
       "ea3f6b335c7620acf59f546fd48484bf624ccb38",
       []
      ],
-     "sandboxed-iframe.sub.https.html.headers": [
+     "resources": {
+      "data-to-javascript-test.mjs": [
+       "3a88253ee3053465472ef7d6ecba74b92fab79ce",
+       []
+      ],
+      "data-url-test.mjs": [
+       "d32d8521be47187b7f8db5d8d5d915e8f9d79de3",
+       []
+      ],
+      "helpers.mjs": [
+       "d1e3cc17a13e28873ad84f2ad8c9a1cba8cdc9ed",
+       []
+      ],
+      "javascript-url-test.mjs": [
+       "de474d8cafca9c073f306034b6c70c68d4222b31",
+       []
+      ],
+      "sandboxed-iframe-test.sub.mjs": [
+       "98575b8d80ecda8c294d29ca8c40199ef40f6fe9",
+       []
+      ],
+      "sandboxed-same-origin-iframe-test.sub.mjs": [
+       "272f805870c932377b80b442f850d55018fdf0dd",
+       []
+      ]
+     },
+     "sandboxed-iframe-yes.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "sandboxed-same-origin-iframe-yes.https.html.headers": [
       "ea3f6b335c7620acf59f546fd48484bf624ccb38",
       []
      ]
@@ -343490,6 +345271,32 @@
      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
      []
     ],
+    "popups": {
+     "opener-yes-openee-no-port.sub.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "opener-yes-openee-no-same.sub.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "opener-yes-openee-no-subdomain.sub.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "opener-yes-openee-yes-port.sub.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "opener-yes-openee-yes-same.sub.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ],
+     "opener-yes-openee-yes-subdomain.sub.https.html.headers": [
+      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
+      []
+     ]
+    },
     "removing-iframes.sub.https.html.headers": [
      "ea3f6b335c7620acf59f546fd48484bf624ccb38",
      []
@@ -343499,24 +345306,24 @@
       "9292fe3894e4a82f77a8877b76faa19fe6dfdb47",
       []
      ],
-     "child-frame-script.mjs": [
-      "783e36092daae6a3998a2701d110add2f55c3a0f",
-      []
-     ],
-     "child-frame-script.mjs.headers": [
-      "cb762eff806849df46dc758ef7b98b63f27f54c9",
-      []
-     ],
      "helpers.mjs": [
-      "73f9406b476bb4afa708d043fb8bb68e6618d946",
+      "8bd1c8e9250071257ca1abda991e173d449fe0da",
       []
      ],
      "helpers.mjs.headers": [
       "cb762eff806849df46dc758ef7b98b63f27f54c9",
       []
      ],
+     "send-header-page-script.mjs": [
+      "fe3dc6a8e0943ed1176aa05a088ce91ab0a03708",
+      []
+     ],
+     "send-header-page-script.mjs.headers": [
+      "cb762eff806849df46dc758ef7b98b63f27f54c9",
+      []
+     ],
      "send-origin-isolation-header.py": [
-      "02976a9c0567f65f25f1b4a186509424e41152c4",
+      "6a67757897660fac221491d36bde48001e6b27d6",
       []
      ]
     }
@@ -343722,7 +345529,7 @@
       []
      ],
      "subframe-painting.html": [
-      "5fb5e28d8a4abf3e5e07d9b06b36694cac2402c0",
+      "00fd39bcb81b56d39fa226dd9cd5f01a18b4a7bf",
       []
      ],
      "subframe-sending-paint.html": [
@@ -343730,7 +345537,7 @@
       []
      ],
      "utils.js": [
-      "975e84dadd4693b8a484221b5ce52f28b554ff01",
+      "5766971dd0d0230c644b385a4d6c282b554b2fe6",
       []
      ]
     }
@@ -343955,6 +345762,10 @@
       "5245a3f2e16bf13967187231db515433217912aa",
       []
      ],
+     "pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html": [
+      "3c88328b004c6f73bee1f83060d89fa0ea04d25d",
+      []
+     ],
      "pointerevent_pointerId_scope-iframe.html": [
       "ab33560b35216ea0976d1c037650122d9336ae39",
       []
@@ -344100,7 +345911,7 @@
       []
      ],
      "portal-host-cross-origin-navigate.sub.html": [
-      "ce7aaf846486f987966470f7150effc93a178468",
+      "26f655a0dbfaeaad6d9b341e31d2ba91b99212de",
       []
      ],
      "portal-host-hidden-after-activation-portal.html": [
@@ -344119,12 +345930,16 @@
       "163c42e655d6aa69a8ba8ccfb8474072eac9d349",
       []
      ],
-     "portal-host-post-message.sub.html": [
+     "portal-host-post-message-x-origin.html": [
+      "eb390e8b539d1b901bbe571f0b19f6eaa9c8d0bb",
+      []
+     ],
+     "portal-host-post-message.html": [
       "3c49d560f4b7f3b41d463dec1dc8ce621f47c0d3",
       []
      ],
      "portal-host.html": [
-      "3a407d8c325823c5c48dde7d2f4524fe436655a2",
+      "e5772082364dd07528073aeb4f981d6f5ff97a74",
       []
      ],
      "portal-inside-iframe.html": [
@@ -344151,6 +345966,10 @@
       "26f62839af5ed8ea7a50535f411780bdf7fd6e03",
       []
      ],
+     "portal-post-message-x-origin-portal.html": [
+      "57631f385c16e9ef709f7bb0f06bb2eaa82046a5",
+      []
+     ],
      "portal-repeated-activate-window.html": [
       "e716034eff860fe567bc373f4676d55f97a5a786",
       []
@@ -344190,6 +346009,10 @@
      "simple-portal.html": [
       "29380099af1a3b9bf0990990ecefd8fa632d30c4",
       []
+     ],
+     "stash-utils.sub.js": [
+      "30efe836331c66f3baa8d6f75c89caefbad6840a",
+      []
      ]
     },
     "xfo": {
@@ -344539,6 +346362,16 @@
      }
     }
    },
+   "raw-sockets": {
+    "META.yml": [
+     "d424a0af6ecc77577524a4db9baf706ae4dc943c",
+     []
+    ],
+    "README.md": [
+     "bcebe03c8f8ed9f758dca37debb3dc43a0057679",
+     []
+    ]
+   },
    "referrer-policy": {
     "4K": {
      "gen": {
@@ -346292,7 +348125,7 @@
     ],
     "chromium": {
      "README.md": [
-      "b53c6a8c4232dbe9c787b0ea17f0ed1a49f1e386",
+      "ec953033f9bf5b06bbd2a8b6eccf4fae4760185f",
       []
      ],
      "contacts_manager_mock.js": [
@@ -346311,14 +348144,6 @@
       "6805c323df5a975231648b830e33ce183c3cbbd3",
       []
      ],
-     "image_capture-mojom.js.headers": [
-      "6c61a34a4ec2e75096db0eb9f7748b142f0db7bb",
-      []
-     ],
-     "image_capture.mojom.js": [
-      "f145d7a3402543a18229629da0133dea81dd3755",
-      []
-     ],
      "mock-barcodedetection.js": [
       "c11f879b5b6e0ce43bffef7f8f5cabe6fba51632",
       []
@@ -346335,6 +348160,10 @@
       "6c61a34a4ec2e75096db0eb9f7748b142f0db7bb",
       []
      ],
+     "mock-idle-detection.js": [
+      "d88d1ad1c55afaee243e1e9146827b073c380613",
+      []
+     ],
      "mock-imagecapture.js": [
       "ce2b968391343339a9958100f564fa73d5c01509",
       []
@@ -346359,32 +348188,8 @@
       "6c61a34a4ec2e75096db0eb9f7748b142f0db7bb",
       []
      ],
-     "mojo_bindings.js": [
-      "70f6cad5e5f06f4f64a0fd4cdcd693fcea12bb78",
-      []
-     ],
-     "mojo_bindings.js.headers": [
-      "6805c323df5a975231648b830e33ce183c3cbbd3",
-      []
-     ],
-     "mojo_web_test_helper_test.mojom.js": [
-      "cfbad086898778b920c2d750890c870e082dc60a",
-      []
-     ],
-     "mojo_web_test_helper_test.mojom.js.headers": [
-      "6805c323df5a975231648b830e33ce183c3cbbd3",
-      []
-     ],
      "nfc-mock.js": [
-      "1a7e15819e67ce0bc9d1db841cb4f091364e8138",
-      []
-     ],
-     "sensor.mojom.js": [
-      "7578dd6d64f0e91d94c9dcc32432fd2ceadd38b6",
-      []
-     ],
-     "sensor_provider.mojom.js": [
-      "d82b15a304a2439f5206e5bc86b91c51fcf94bd8",
+      "4c5f68be9d5ccd269782ca24d1b1f7bfccf4200c",
       []
      ],
      "web-bluetooth-test.js": [
@@ -346853,7 +348658,7 @@
      ]
     },
     "test-only-api.js": [
-     "ae3137481daf50639f4045d5b748977854e37984",
+     "3fdf1cea6eb1374b7df7ede2e7dca27ceafd16b9",
      []
     ],
     "test-only-api.js.headers": [
@@ -346881,7 +348686,7 @@
      []
     ],
     "testharness.js": [
-     "2bbc935de40505cd7673f3788905786f6d66daff",
+     "61eadfeb6541a974522bf9890ff5f68fd6cb5d5e",
      []
     ],
     "testharness.js.headers": [
@@ -346913,6 +348718,18 @@
      }
     }
    },
+   "sanitizer-api": {
+    "META.yml": [
+     "7ac32665e19a0b6c48db80a2c063f3b3e37600ab",
+     []
+    ],
+    "support": {
+     "testcases.sub.js": [
+      "d1af1c9b5a9fc5d057fd3fd14c48283ecfbb7337",
+      []
+     ]
+    }
+   },
    "screen-capture": {
     "META.yml": [
      "47882d3275f1cc928555045b2def8fc90f6bcdb0",
@@ -346974,7 +348791,7 @@
     ],
     "resources": {
      "screenenumeration-helpers.js": [
-      "d96fca74b5d4520103f459120881b2aa03994a54",
+      "7d5d52219433d061fed6600c437e32f843be3d5b",
       []
      ]
     }
@@ -347012,6 +348829,10 @@
      "13225f6f18fb909faa65d1d6f83af2f06f9e5d7f",
      []
     ],
+    "client-redirect.html": [
+     "73858969e02e64e97f1cc50a84935eeeb9068dfe",
+     []
+    ],
     "force-load-at-top-target.html": [
      "72feec8a4086283f2df5af5994dafc79f93d387b",
      []
@@ -347036,6 +348857,14 @@
      "e500009f91c0201a2a397a4267a6764cdb1eae8a",
      []
     ],
+    "redirects-target.html": [
+     "5e44230a958c591fa4af082a70e8cd08bc421722",
+     []
+    ],
+    "redirects-target2.html": [
+     "239c0fe1e616093d603e6ed92ae0a90bd34dd0ab",
+     []
+    ],
     "scroll-to-text-fragment-target.html": [
      "b2be85132cb8f2f2c14c82bf1854c3130f375c96",
      []
@@ -347935,7 +349764,7 @@
        []
       ],
       "cache-add.js": [
-       "f1617109cfa1385a2eab8d389e19e98ff00970f7",
+       "62b44c7880168b5762785ed9f75c2dfa167f9401",
        []
       ],
       "cache-delete.js": [
@@ -347955,7 +349784,7 @@
        []
       ],
       "cache-put.js": [
-       "44ba565d86ca05edbf62559f262a64e0da75f96b",
+       "b45910a3b8ba089e1724efa8b9e8a8d679c59320",
        []
       ],
       "cache-storage-keys.js": [
@@ -349315,7 +351144,7 @@
        []
       ],
       "test-helpers.sub.js": [
-       "bbd16abce4b3703a2f7499e7c2c4c7590566d33e",
+       "38840b75303dc598cf66a8771e51bbc5877db8fa",
        []
       ],
       "test-request-headers-worker.js": [
@@ -349584,7 +351413,7 @@
     ],
     "resources": {
      "shapedetection-helpers.js": [
-      "bdb0e857d788ab0b2778cc9946386ead3d224b2c",
+      "05424de893dc9ac59d7f40c436bb73c9523da52f",
       []
      ]
     }
@@ -349981,6 +351810,18 @@
       "0593980e1055b56b34218a21d8f7687129a84d5a",
       []
      ]
+    },
+    "transferable": {
+     "resources": {
+      "create-wasm-module.js": [
+       "37064af95c55c00e27d5f73b8fc3b0603ac63077",
+       []
+      ],
+      "deserialize-error-frame.html": [
+       "5ec2fcda2cdd8dba66ed97240cb836d45596c905",
+       []
+      ]
+     }
     }
    },
    "subresource-integrity": {
@@ -351088,7 +352929,7 @@
       []
      ],
      "config.json": [
-      "e9fbc5768006d1970bc2a955d30f11b570eadf20",
+      "df93c6fc34f78eaf9e3089afb523436099e17149",
       []
      ],
      "web-platform.test.key": [
@@ -351167,7 +353008,7 @@
        []
       ],
       "safari-technology-preview.rb": [
-       "9219623d55f6e034703f5125ac7285e1ba68d7aa",
+       "0268ac4b4485d9f688636954fb5b3cc2ade01f3a",
        []
       ],
       "system_info.yml": [
@@ -351208,7 +353049,7 @@
       []
      ],
      "commands.json": [
-      "929d2c091457b34f085397a1a525c3ae5e5248fb",
+      "3fb6d222b17ded9f78b02607509d090b0661fb4d",
       []
      ],
      "epochs_update.sh": [
@@ -351231,6 +353072,10 @@
       "2396e9b8aee8a166c3b9321c7e9ec2e8f9b549c0",
       []
      ],
+     "regen_certs.py": [
+      "a449bd8b82b8ecef058e1625ca1339ad5f57adf6",
+      []
+     ],
      "run_tc.py": [
       "3a3b0d8090baf7ab60f364dfd6908b6be7011f8e",
       []
@@ -351257,7 +353102,7 @@
        []
       ],
       "github_checks_output.py": [
-       "16d399002984e0b9daf8a0239b49bedbea50914b",
+       "b34e33dd9e817a80ac60a022fbfb6f0cb9c13766",
        []
       ],
       "sink_task.py": [
@@ -351270,7 +353115,7 @@
       ],
       "tasks": {
        "test.yml": [
-        "b1534c9d230d0b443ba2ecf83aacc58598221ae8",
+        "c3fccff065555c25961efa6599c32b3a6d495e93",
         []
        ]
       },
@@ -351404,7 +353249,7 @@
       []
      ],
      "lint.py": [
-      "7bec438b773da96e30986aa974b66043248bc079",
+      "8965c1a0a12926213eb74f7f880c198004cf46fc",
       []
      ],
      "rules.py": [
@@ -351609,7 +353454,7 @@
        []
       ],
       "test_lint.py": [
-       "5857f02b6fa0b6bf580008180dbb66efe2d9a18d",
+       "e9925180f20a84f9653c67daad5fd366738f754a",
        []
       ],
       "test_path_lints.py": [
@@ -351866,7 +353711,7 @@
       []
      ],
      "serve.py": [
-      "74a2ebc386009adff5090ab7741f1c54074d56f4",
+      "1c44615358567d6477f3746171bffef3935d9cc3",
       []
      ],
      "test_functional.py": [
@@ -356566,6 +358411,10 @@
       ]
      },
      "pywebsocket3": {
+      ".gitignore": [
+       "70f2867054198471182cc8619663a684d958f6ca",
+       []
+      ],
       ".travis.yml": [
        "2065a644dd6b60797128b09998f67b5135b1189e",
        []
@@ -356583,7 +358432,7 @@
        []
       ],
       "README.md": [
-       "277cbe550c065782b0e315de04651c9e068cb3ad",
+       "8684f2cc7ee36960ef3ba9a7dafeef8db591a6f7",
        []
       ],
       "example": {
@@ -356628,7 +358477,7 @@
         []
        ],
        "echo_client.py": [
-        "e4459a19bc68c7879a174f572122382914e6f7dd",
+        "dafda059b1139935a571b811daa5a10d4158c61b",
         []
        ],
        "echo_noext_wsh.py": [
@@ -356698,7 +358547,7 @@
         []
        ],
        "extensions.py": [
-        "344539f6fce14bee65d7fa7a583acbb65f023aff",
+        "314a949d4550ab6ff5500f5254387d2b35cae535",
         []
        ],
        "fast_masking.i": [
@@ -356720,7 +358569,7 @@
         ]
        },
        "http_header_util.py": [
-        "ded90b247b8ded9f254daba70909cbc8ff3c82d6",
+        "21fde59af10c3b6e373fc2d64f19401c6ed7dc38",
         []
        ],
        "memorizingfile.py": [
@@ -356732,7 +358581,7 @@
         []
        ],
        "request_handler.py": [
-        "e038d9f43acd37bf5a1b10a0ce5585bd51ed602d",
+        "5e9c875dc7daff9929a47d448afcb5aa5bad1b2c",
         []
        ],
        "server_util.py": [
@@ -356740,7 +358589,7 @@
         []
        ],
        "standalone.py": [
-        "1042c496c58a23b6ce4c23eee0ba462095452671",
+        "b075d989f052bb08d15a5a83b6222457da94821c",
         []
        ],
        "stream.py": [
@@ -356784,7 +358633,7 @@
         ]
        },
        "client_for_testing.py": [
-        "450a6acd5376223c603abe264b967796832fb573",
+        "f9aa8119e342a25ccf39a37db64921c67e8e0545",
         []
        ],
        "mock.py": [
@@ -356792,19 +358641,19 @@
         []
        ],
        "run_all.py": [
-        "f622015539e47fdf518875158f6bd6f36994faba",
+        "ea52223cea6d1458adc39dcd2f8b956c885fb419",
         []
        ],
        "set_sys_path.py": [
-        "9fce7b34b6751d635dcda6e0d4a5711951a0a33b",
+        "48d0e116a5843c1adfedb8cc4c5918c5c2003277",
         []
        ],
        "test_dispatch.py": [
-        "ae63980f2581f9f6136e85dc16bb64ccbe373dc9",
+        "132dd92d76cef648e2516702e3530e918fb6f4b9",
         []
        ],
        "test_endtoend.py": [
-        "445d29c67ddf07b3f123245977f95cfe0148c83a",
+        "8d457ff68595feb59a70d0c3e0145d567202444d",
         []
        ],
        "test_extensions.py": [
@@ -356832,7 +358681,7 @@
         []
        ],
        "test_msgutil.py": [
-        "943f21b8d297668770cb91c501c2b2fc8258b9eb",
+        "1122c281b7874bfb3dc1a93f55c4ed3062107825",
         []
        ],
        "test_stream.py": [
@@ -356840,7 +358689,7 @@
         []
        ],
        "test_util.py": [
-        "20347941051455ebee58823b4b0be93762912b0a",
+        "bf4bd32bbac30c52d99997fecc7bbb83cf7516ad",
         []
        ],
        "testdata": {
@@ -357437,7 +359286,7 @@
       "css": {
        "bulma-0.7.5": {
         "bulma.css": [
-         "e793432ae31c34957cab74f791d298871d90fa26",
+         "150bbfd34a3abf54bbad6036c70d00a5f32eccc2",
          []
         ],
         "bulma.css.map": [
@@ -357627,7 +359476,7 @@
        []
       ],
       "client.py": [
-       "fe5189ec0b30a4e20642624c55e464ef40f2901d",
+       "0f79483826b34bdd5f5331d715cebbcda82e4737",
        []
       ],
       "error.py": [
@@ -357654,7 +359503,7 @@
       []
      ],
      "browser.py": [
-      "6c1c445de23557953210be0b4595dec7fc6bf26a",
+      "664d984da0403acf03a13406f8263780f9be7ead",
       []
      ],
      "commands.json": [
@@ -358012,7 +359861,7 @@
         []
        ],
        "chrome.py": [
-        "327231eb7befa3f86ba9d7da2eff2e774b8a0383",
+        "880e2bd43eb6bbb4c9b8d052af77537ce3f27e3d",
         []
        ],
        "chrome_android.py": [
@@ -358023,6 +359872,10 @@
         "6db0188e55ebff8d3a40f9a15dc714419edacbeb",
         []
        ],
+       "chrome_spki_certs.py": [
+        "e8971e7acde3ed68bf5671e7e2f812765eb7c6c8",
+        []
+       ],
        "edge.py": [
         "bdb37b3f84c2cdc4010a7a289a53564822a3a34c",
         []
@@ -358040,7 +359893,7 @@
         []
        ],
        "firefox.py": [
-        "91384cb0addaeac640e94c8d55faa2ce394af783",
+        "151530897d9b1f77e9dcd4f1971bed1c4d6ff8b0",
         []
        ],
        "firefox_android.py": [
@@ -358128,7 +359981,7 @@
         []
        ],
        "executormarionette.py": [
-        "e0e6aba0f57853e863355a308ade56c24575da72",
+        "9c1f4f366d5fe782b772b79d3f6d4978ada010ac",
         []
        ],
        "executoropera.py": [
@@ -358271,7 +360124,7 @@
        []
       ],
       "stability.py": [
-       "605b40281a1b559e47d6aa795bb5cbd4b8715177",
+       "88d1c232bfb52d4c2e16fed9103ca8d62ae86632",
        []
       ],
       "testdriver-extra.js": [
@@ -358299,11 +360152,11 @@
        []
       ],
       "testloader.py": [
-       "af1b00725dc43ba6e864bec8f8c837923c8da38d",
+       "4a3fa4273654a8a86d5224ef6b0a9daed73b01d7",
        []
       ],
       "testrunner.py": [
-       "4c9468a0eba4b3c38821446aba65dec58137b229",
+       "0bde5ba348ea08984c1b95f78d926218b3713890",
        []
       ],
       "tests": {
@@ -358354,7 +360207,7 @@
         []
        ],
        "test_testloader.py": [
-        "836003d106038ab4303035eecca31774c9a26ce1",
+        "394d2a00177b64635882af5f2a97f7d47add5ef8",
         []
        ],
        "test_update.py": [
@@ -358397,7 +360250,7 @@
        ]
       },
       "vcs.py": [
-       "1de951938cf57692edca2e019bdfdc6260b8fe62",
+       "896d8a0d2c6ef1583b704f898d21ac957d99c793",
        []
       ],
       "webdriver_server.py": [
@@ -358405,7 +360258,7 @@
        []
       ],
       "wptcommandline.py": [
-       "ea586825616132b410127124ad2152ae88554cde",
+       "532c795cd3c5f5bc1e2f8b43bfca38152b79d4ab",
        []
       ],
       "wptlogging.py": [
@@ -358475,11 +360328,11 @@
        }
       },
       "wptrunner.py": [
-       "f033205a00b88a6ab2521c5e1e6df51095cf4801",
+       "897b4a9f815486d9e651de9ddd3cfae7d7872949",
        []
       ],
       "wpttest.py": [
-       "c670179c81a0666162d5f959b311fda58786c9e3",
+       "31b245612be0c743f17479e08db48af0d417637c",
        []
       ]
      },
@@ -358515,7 +360368,7 @@
        []
       ],
       "index.rst": [
-       "a9f630c760f6e0d2b156ceb45c44af42007757c1",
+       "c6157b4f8c4b70fb40e48f72092028d9c0d00a42",
        []
       ],
       "introduction.rst": [
@@ -358730,7 +360583,7 @@
         []
        ],
        "test_pipes.py": [
-        "5278843833640e7944df4e2305469d380a92dcc5",
+        "0c487c57d4d48bfa02692f5f5b4d0e25c7467ce1",
         []
        ],
        "test_request.py": [
@@ -358785,7 +360638,7 @@
        []
       ],
       "handlers.py": [
-       "2cc25e2c21cea4ed6826a94320d452c0d386fe2b",
+       "6677ab394b7a31d4fe0253e8fbfbb54995a7e006",
        []
       ],
       "logger.py": [
@@ -359364,7 +361217,7 @@
       []
      ],
      "setters_tests.json": [
-      "db217da23d559bc7983471cda5547a6551b84945",
+      "d06fb2cfe629b80456502c7d3911b5debd71929e",
       []
      ],
      "toascii.json": [
@@ -359372,7 +361225,7 @@
       []
      ],
      "urltestdata.json": [
-      "bc79426526c1a5ea9a4c9d07fc9305b0409089f4",
+      "76a8b3a015dcbc7a27ea22ba92a0214afce051e1",
       []
      ]
     }
@@ -359561,7 +361414,7 @@
      },
      "table": {
       "assertions.js": [
-       "b1aeaf1a65dab748c56c8cdf9c1393f97bfdf0e5",
+       "19cc5c3b92d6fa6748c3831f3629c92b62ed757f",
        []
       ]
      },
@@ -359733,7 +361586,7 @@
      ]
     },
     "testcommon.js": [
-     "baa7550d66045e56d668f37fd4d349854f5e6753",
+     "933ee95af2bfa7bf44b204d8a9350655d3a2924c",
      []
     ],
     "timing-model": {
@@ -359772,6 +361625,14 @@
     ],
     "resources": {
      "dynamic": {
+      "__dir__.headers": [
+       "cb762eff806849df46dc758ef7b98b63f27f54c9",
+       []
+      ],
+      "classic_script.js": [
+       "db69b96188d7ca20b8bb12b429aead8fcfdc7b64",
+       []
+      ],
       "resource1.js": [
        "7bd437364a24b6e94493c2acca939991b15cd41c",
        []
@@ -359790,6 +361651,10 @@
       ]
      },
      "dynamic1": {
+      "classic_script.js": [
+       "5fcf045906c1ab151512a3e425b7c5c6f79cee59",
+       []
+      ],
       "resource1.js": [
        "6fd1de600e5599bfe4740b06da6d089e65838f55",
        []
@@ -359808,6 +361673,10 @@
       ]
      },
      "dynamic2": {
+      "classic_script.js": [
+       "546d8a503d90f4de7ca4f45098c8753160c0b169",
+       []
+      ],
       "resource1.js": [
        "c6f751cec49ebe67e3a9a827ef3764ab730a6f17",
        []
@@ -359826,7 +361695,7 @@
       ]
      },
      "generate-test-wbns.sh": [
-      "c3dd8ebc72015ac607e73769f036f5169b720149",
+      "860327fe2451015ed9ca538c39cffff14bdccc19",
       []
      ],
      "location": {
@@ -359854,12 +361723,16 @@
        "21e57b9caca1183ecda6f5d4fb9ebd556abf769a",
        []
       ],
+      "dynamic1-crossorigin.wbn": [
+       "5ebb86178e9bf5cccfa09878210c7866f9d80478",
+       []
+      ],
       "dynamic1.wbn": [
-       "22db19e7ce14d40cc4ba87d120486c24da1a4070",
+       "9e69e1fd89834bd2d238859413fc8e09d8b6b181",
        []
       ],
       "dynamic2.wbn": [
-       "44c4b1ee86662af2b474447335267cf7b274e62b",
+       "e4d04d60c2aa9050c6454ad9f88af407a844669d",
        []
       ],
       "location.wbn": [
@@ -359867,7 +361740,7 @@
        []
       ],
       "subresource.wbn": [
-       "395039dc216250729ed75bdab2c10a7f16998f16",
+       "4d059e7c0b819500c437529446158d2884915c4c",
        []
       ]
      }
@@ -359916,7 +361789,7 @@
     ],
     "resources": {
      "nfc-helpers.js": [
-      "afe101d36aa3f294f495b705a520f18c831b0582",
+      "13cbe49370e9a7245755c9c69be63117f4440d33",
       []
      ],
      "support-iframe.html": [
@@ -360346,9 +362219,21 @@
     }
    },
    "webcodecs": {
+    "h264.mp4": [
+     "e21fcba32c125fba820ffa2269013c612d2b78fc",
+     []
+    ],
     "pattern.png": [
      "85676f29ff5806a32ac6713e601fdcb71dd03777",
      []
+    ],
+    "utils.js": [
+     "940c2c28b962f326fa94f509ddb1468902f5b150",
+     []
+    ],
+    "vp9.mp4": [
+     "7553e5cae9202c0f144126910e9471658038b455",
+     []
     ]
    },
    "webdriver": {
@@ -360659,7 +362544,7 @@
        []
       ],
       "conftest.py": [
-       "dffae0b98cd67c664883f4e4efd608415c82b179",
+       "5ee8ae1c741a9c75658d36d774e0c2523913c6d5",
        []
       ],
       "support": {
@@ -360971,7 +362856,11 @@
      []
     ],
     "RTCPeerConnection-helper.js": [
-     "2d91e5f583715d5aca5efdf4e704db70b02fbfc9",
+     "5aef0a8e21e42fafe58719c0fb246a919d1b15d1",
+     []
+    ],
+    "RTCPeerConnection-perfect-negotiation-helper.js": [
+     "28c476ec409e1b5f53eae41aff934868abeb692d",
      []
     ],
     "RTCRtpCapabilities-helper.js": [
@@ -361084,6 +362973,14 @@
     ]
    },
    "webrtc-insertable-streams": {
+    "RTCPeerConnection-insertable-streams.js": [
+     "87f4394b0b5e42be0ef00f78506eded669010b9f",
+     []
+    ],
+    "RTCPeerConnection-sender-worker-single-frame.js": [
+     "c943dafe5b154314132124e1d563df2a00b2aaf7",
+     []
+    ],
     "resources": {
      "blank.html": [
       "a3c3a4689a62b45b1e429f6b7a94690e556a1259",
@@ -361253,6 +363150,10 @@
       "f0819101c83603635e7bfc8495d8fafbed2eab36",
       []
      ],
+     "stash_responder_blocking_wsh.py": [
+      "10ecdfe0da94cfdefed4b4516626c5bde48c1640",
+      []
+     ],
      "stash_responder_wsh.py": [
       "fd6eabc7023f435b440a4310d8bcd67f0ab40414",
       []
@@ -361327,7 +363228,7 @@
      []
     ],
     "README.md": [
-     "6b70aa5ac9d3d6a9d4a42013455d3992fbb5b9e9",
+     "2bbc5fbfb6a1df0db59cca67435e9c39937cac02",
      []
     ],
     "eventTestHarness.js": [
@@ -361450,7 +363351,7 @@
       []
      ],
      "usb-helpers.js": [
-      "b41c054c7168bfc32ecd557f2f8c98d7fbecbfe9",
+      "bb6745124788ba3626b2bda563693d5e1c51c936",
       []
      ]
     },
@@ -363454,7 +365355,7 @@
       []
      ],
      "webxr_util.js": [
-      "a987ca1f4420c16b3e55620115d536a635ae3695",
+      "aa45e257db678a67521d1f167d5ffdfd5d11eae2",
       []
      ]
     },
@@ -363793,14 +365694,14 @@
        ]
       },
       "onerror": {
-       "exception-in-onerror.js": [
-        "61a95dda51f7e74c3fdff46fcfd09d7f2305dbe5",
-        []
-       ],
        "handled.js": [
         "e58fa4a51521ba19ff9ab87bc185984c99018833",
         []
        ],
+       "message-helper.js": [
+        "6271329b031402568ad862f9dadd6bdf6faf0b02",
+        []
+       ],
        "not-handled.js": [
         "c3254b0ba7e1709e18d24816fffe94d5983237dd",
         []
@@ -363808,6 +365709,10 @@
        "propagate-to-window-onerror.js": [
         "0daf488d6f522b80c3884fb75d21df996294a18a",
         []
+       ],
+       "throw.js": [
+        "704098a6d868549316256c0f92718dd1b0a4d765",
+        []
        ]
       }
      },
@@ -364687,16 +366592,16 @@
    ],
    "x-frame-options": {
     "META.yml": [
-     "674a1648847c6a7ef65c34ccfa69b81b8b69a7e6",
+     "21ef0699364f406f337cfda70d974bacc4b5a934",
      []
     ],
     "README.md": [
-     "7b35f0f1d14464f84ce3367fdbaacdbd65f78fda",
+     "2fad3599d5cf2b189b422bbe2dd4ff9a2f134817",
      []
     ],
     "support": {
-     "helper.js": [
-      "2932a0a7fb00f011d02753b621a2e7784120e871",
+     "helper.sub.js": [
+      "23663dd2d072364dbb5921f38a4e0fbb96e3dfe4",
       []
      ],
      "nested.py": [
@@ -365411,7 +367316,7 @@
       ]
      ],
      "File-constructor.html": [
-      "63fda5e8d17d0f1d297014c0ff3f721edb122bb6",
+      "3477e4ada16e9297c2f2ee91da1d17f930a6a913",
       [
        null,
        {}
@@ -376478,7 +378383,7 @@
        ]
       ],
       "DOMException-custom-bindings.any.js": [
-       "ed05d27646f606f379fa821bd9358d1be3455f65",
+       "cd4e5b6341948cb8fad29cc29483dcf6b8444bcd",
        [
         "WebIDL/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.html",
         {}
@@ -376657,11 +378562,37 @@
       ]
      ]
     },
-    "idlharness.html": [
-     "2683aae9cb6c5f48083159b67d18c6dedb11b481",
+    "idlharness.any.js": [
+     "efc475a9879dbc379eafcc2c62df0d16e6afce42",
      [
-      null,
-      {}
+      "WebIDL/idlharness.any.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "WebIDL/idlharness.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
      ]
     ]
    },
@@ -382069,6 +384000,15 @@
       }
      ]
     ],
+    "async-svg-script-removal.https.html": [
+     "cd1a551d9d12852f3ff8233bf535eb29e88c48ef",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "async-write-blobs-read-blobs.https.html": [
      "50d23a9c3625d5295407a783ad63908571fd55f7",
      [
@@ -382096,6 +384036,15 @@
       }
      ]
     ],
+    "async-write-svg-read-svg.https.html": [
+     "19c91597c111ee267e95f6d4bb0092fa2aafec25",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "clipboard-events-synthetic.html": [
      "878682975266a3154756361a4e5d87c47482e393",
      [
@@ -383246,11 +385195,15 @@
    },
    "contacts": {
     "contacts-select.https.window.js": [
-     "c93d711ed5205fffb96298423d853bf4171ff8d3",
+     "850217aadfa7e6cab4d5551ae2b892286080ab34",
      [
       "contacts/contacts-select.https.window.html",
       {
        "script_metadata": [
+        [
+         "script",
+         "/resources/test-only-api.js"
+        ],
         [
          "script",
          "/resources/testdriver.js"
@@ -383719,7 +385672,7 @@
       ]
      ],
      "subsumption_algorithm-general.html": [
-      "28f7eaab0a0e6d943f136d370b58f6f38fa664b8",
+      "a275096ce2eda40aaa874985af0db219d6a1c028",
       [
        null,
        {}
@@ -384214,14 +386167,14 @@
       ]
      ],
      "frame-src-same-document-meta.sub.html": [
-      "28129184bda87bb79bb70b4e10a6512a3cb5aed8",
+      "f4122f3d356b37860a29634e47bde9147432ba09",
       [
        null,
        {}
       ]
      ],
      "frame-src-same-document.sub.html": [
-      "eeda05bb43b2a651540bc54d175f4f42a98d3734",
+      "9868f92955859fc6fe15a68e9407c4de87d0f6f9",
       [
        null,
        {}
@@ -387076,7 +389029,7 @@
      ]
     ],
     "cookieStoreManager_getSubscriptions_multiple.tentative.https.any.js": [
-     "cf22e46a1949a680ae3a5d65071f0641e13f5a03",
+     "9e153d03aae798371d4c28649de7126f18aefe76",
      [
       "cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.html",
       {
@@ -387117,7 +389070,7 @@
      ]
     ],
     "cookieStoreManager_getSubscriptions_single.tentative.https.any.js": [
-     "fac0f408e0629712bac6fa02e09e17ddd003d26e",
+     "98ec19df3f1881666a48f2f920000c3a11b67f82",
      [
       "cookie-store/cookieStoreManager_getSubscriptions_single.tentative.https.any.html",
       {
@@ -387231,7 +389184,7 @@
      ]
     ],
     "cookieStore_event_basic.tentative.https.window.js": [
-     "5f20947dbf1051bd14ce23f45e632290da2ed7c9",
+     "9812a046bc608403daa498cc25265eac107dcd86",
      [
       "cookie-store/cookieStore_event_basic.tentative.https.window.html",
       {}
@@ -387252,7 +389205,7 @@
      ]
     ],
     "cookieStore_getAll_arguments.tentative.https.any.js": [
-     "ab88ec308045c13b6f391370c9bbeb9602821c80",
+     "5055a42e5d39fea6214baf3e782f5461594a9643",
      [
       "cookie-store/cookieStore_getAll_arguments.tentative.https.any.html",
       {
@@ -387351,7 +389304,7 @@
      ]
     ],
     "cookieStore_get_arguments.tentative.https.any.js": [
-     "4cf596bbec2659856be3710d999c26a7cebbda1d",
+     "a56032f03e20e87c48e4a20e645f9fd63bdd65cf",
      [
       "cookie-store/cookieStore_get_arguments.tentative.https.any.html",
       {
@@ -387384,7 +389337,7 @@
      ]
     ],
     "cookieStore_get_delete_basic.tentative.https.any.js": [
-     "6c744533321f41c9e594de6210355c890e912abd",
+     "9337669afd5b61d821e9945bd2f3299d8afb8bad",
      [
       "cookie-store/cookieStore_get_delete_basic.tentative.https.any.html",
       {
@@ -387504,7 +389457,7 @@
      ]
     ],
     "cookieStore_opaque_origin.tentative.https.html": [
-     "bbf0dbd9864c574fadbd2b464618766ff1919a19",
+     "94a13fe63f9acbb369c448c5e339286f1d6ebf4b",
      [
       null,
       {}
@@ -387577,7 +389530,7 @@
      ]
     ],
     "cookieStore_subscribe_arguments.tentative.https.any.js": [
-     "c86ea871645e1d9a289a4f8acb0f300d104c8418",
+     "ca5f55d645be5188177eeb0b03a51a175a7f9e64",
      [
       "cookie-store/cookieStore_subscribe_arguments.tentative.https.any.html",
       {
@@ -387809,14 +389762,14 @@
      ]
     ],
     "serviceworker_cookieStore_subscriptions_reset.tentative.https.html": [
-     "bff1f04bad061c187b33b56e1760b97b784cb690",
+     "a1124e9220150ea48e016d805ead1f210a247a25",
      [
       null,
       {}
      ]
     ],
     "serviceworker_cookiechange_eventhandler_mismatched_subscription.tentative.https.any.js": [
-     "b1e412c7997d7251072064996fe7b4b86a13f304",
+     "30d8d70940dae248b3b5cba030056daac78b32a6",
      [
       "cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.tentative.https.any.serviceworker.html",
       {
@@ -387834,7 +389787,7 @@
      ]
     ],
     "serviceworker_cookiechange_eventhandler_multiple_subscriptions.tentative.https.any.js": [
-     "f983f54b44a4c29388543a0bf13e89cedde12264",
+     "cd0657c0bcdf5fc5a2133fb0598778aa237c384c",
      [
       "cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.tentative.https.any.serviceworker.html",
       {
@@ -387852,7 +389805,7 @@
      ]
     ],
     "serviceworker_cookiechange_eventhandler_overlapping_subscriptions.tentative.https.any.js": [
-     "b4089030e6b76f17967b999c56064a362c40ceeb",
+     "1f433aeb9476983cabccead67032ddb88d3ebc32",
      [
       "cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.tentative.https.any.serviceworker.html",
       {
@@ -387870,7 +389823,7 @@
      ]
     ],
     "serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.js": [
-     "b38d91a3c6576b9596e4227996a0ac4dc48f672d",
+     "3ccb4b303d90165eed0f7830ac1faed56ee29bba",
      [
       "cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.serviceworker.html",
       {
@@ -387888,7 +389841,7 @@
      ]
     ],
     "serviceworker_oncookiechange_eventhandler_single_subscription.tentative.https.any.js": [
-     "1921583e5c520a0d5b23ae6f9f5fa75640ca16bd",
+     "8def2440897b931c2af4402654a92ca89c34ea98",
      [
       "cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.tentative.https.any.serviceworker.html",
       {
@@ -390158,7 +392111,7 @@
       ]
      ],
      "event-dispatch.tentative.html": [
-      "d54031c2f4a6768e10303f3584096dad96676b0c",
+      "3e577d6ea6c67269766ed9ec38d13bd4cbda435c",
       [
        null,
        {
@@ -392117,7 +394070,7 @@
        ]
       ],
       "content-visibility-026.html": [
-       "d0815186edb90dd016d238ca1eaeb928dce0c979",
+       "1306493f62a32d5e2f35b36f61036c4c53574853",
        [
         null,
         {}
@@ -392695,7 +394648,7 @@
       ]
      ],
      "canvas-dynamic-change-001.html": [
-      "38aa0006d5799f684c16bcb893c6783f184a182e",
+      "09d524e7356f49c72f407713b23e70cedf5c7838",
       [
        null,
        {}
@@ -393999,6 +395952,13 @@
        null,
        {}
       ]
+     ],
+     "table-with-percent-intrinsic-width.html": [
+      "e0cd66dd8402105636ba41f70736fbc84a81b0f2",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-font-loading": {
@@ -397603,7 +399563,7 @@
        ]
       ],
       "grid-intrinsic-track-sizes-001.html": [
-       "f570f02aa709b54693f2a092f46d4d78d680ea9d",
+       "5c740681f8f7e46ed8ad5a5a582419020d1f0520",
        [
         null,
         {}
@@ -399707,7 +401667,7 @@
        ]
       ],
       "overflow-computed.html": [
-       "1bacd9b01e845f97507753dbd378042a412429d6",
+       "563d1b31d259c650935684b727544e75960b0444",
        [
         null,
         {}
@@ -399783,6 +401743,41 @@
        null,
        {}
       ]
+     ],
+     "scrollbar-gutter-001.html": [
+      "b8c157a1ecd1b4f806e64060cbbd2a993499cbf4",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-002.html": [
+      "5cfc45c358c540d4ca81d79aa199d2dcb0bfe494",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-003.html": [
+      "17f724fb37c7a98241e12aad47b3365f9dccb33d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-004.html": [
+      "2f9ac9b7f330de181560d8aac5c3780682bc9780",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollbar-gutter-005.html": [
+      "5f1e8413f3b93c0fe44f0e55b02f83cb37f192f2",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "css-overscroll-behavior": {
@@ -400756,7 +402751,7 @@
       ]
      ],
      "marker-default-styles.html": [
-      "865a2d01a9927cfc1e26b8655109d14411fc782c",
+      "0f988d8eb064558716ceea4164a24585db8b3c3d",
       [
        null,
        {}
@@ -400794,14 +402789,14 @@
      ],
      "parsing": {
       "marker-supported-properties-in-animation.html": [
-       "bc26e202696e9f3892fcacc92ca96a473ca86807",
+       "5f7dab7a8bfb908d900230cfbf06dacd53a9d693",
        [
         null,
         {}
        ]
       ],
       "marker-supported-properties.html": [
-       "669d040671bc62862721583cf6917b754b317a89",
+       "15a4e894ff3a46c632d91de8c27834a5269149eb",
        [
         null,
         {}
@@ -401183,7 +403178,7 @@
       ]
      ],
      "focus-prioritized.html": [
-      "36e3c7644a715486f027ac7d0dfb444d9b7ea5dd",
+      "32d90badcad8003ef6cbba33090221d5e106cd34",
       [
        null,
        {}
@@ -402254,21 +404249,21 @@
         ]
        ],
        "shape-margin-000.html": [
-        "487868cee6024afcc7a57fb6d4a27a9eaf19128c",
+        "850b7c66113744e3a0a19fb6f84bc302e4c9d9bd",
         [
          null,
          {}
         ]
        ],
        "shape-margin-001.html": [
-        "28eca1a6bafc39408d1c623a0b2625cd4da1478b",
+        "d0915830e8dea7633f34885e88fa0b6eb27dfcf2",
         [
          null,
          {}
         ]
        ],
        "shape-margin-002.html": [
-        "4cb0c69ba78c410712da74b7b809416dc37c3540",
+        "0618588722afd798e06b63bcaeb01f7ac5013d2a",
         [
          null,
          {}
@@ -403416,6 +405411,13 @@
         {}
        ]
       ],
+      "page-windows-1252-http-windows-1251-css-utf8-bom.html": [
+       "6a65942e16ef3b312c78b763158d94953ef5e3c7",
+       [
+        null,
+        {}
+       ]
+      ],
       "xml-stylesheet-page-windows-1251-charset-attribute-windows-1250.xhtml": [
        "512df7a0ba0318bd4de16af5cf46b4feaac71eea",
        [
@@ -403881,7 +405883,7 @@
       ]
      ],
      "table-model-fixup-2.html": [
-      "737a8d7e2a8b38304b4aff8c70ba7a29fcf1d310",
+      "1bc4a2f681915b748d0d8b05cba7d63e4f1938e0",
       [
        null,
        {}
@@ -404223,6 +406225,13 @@
         {}
        ]
       ],
+      "tab-size-interpolation.html": [
+       "3cf63782f59adb481c77539e4ab062a3de57df47",
+       [
+        null,
+        {}
+       ]
+      ],
       "text-indent-composition.html": [
        "57c528ca271646a284048bb49e11025ac25469da",
        [
@@ -407149,6 +409158,13 @@
        {}
       ]
      ],
+     "changing-while-transition-004.html": [
+      "71038ac11f78b3581645587da205d74b9ee71610",
+      [
+       null,
+       {}
+      ]
+     ],
      "currentcolor-animation-001.html": [
       "bcc7991a828ada651764f740d6e2f05f24f8d332",
       [
@@ -407505,14 +409521,14 @@
       ]
      ],
      "transition-delay-001.html": [
-      "921525ea72d2e1e28d2321c1594085deaf2330f0",
+      "8fa5f5825aad03ae69df79c038d792683c9d70a0",
       [
        null,
        {}
       ]
      ],
      "transition-duration-001.html": [
-      "b5c095f001efb373934850db67527ace118e10cd",
+      "60b9f5fc5c872c90e2ba533014eea0d61999d968",
       [
        null,
        {}
@@ -411621,6 +413637,20 @@
        {}
       ]
      ],
+     "CSSCounterStyleRule.html": [
+      "afae84b0b25f4aebf2461179cf5a5a2b769cce4f",
+      [
+       null,
+       {}
+      ]
+     ],
+     "CSSFontFaceRule.html": [
+      "438c30df9ebcf456dce9a36a90facb7f8e3296e6",
+      [
+       null,
+       {}
+      ]
+     ],
      "CSSGroupingRule-cssRules.html": [
       "e4afd5e560fc317db0490010d692174522fafa66",
       [
@@ -413083,7 +415113,7 @@
       ]
      ],
      "scroll-behavior-main-frame-root.html": [
-      "8aef86977476fead47e93a0cc737d81238f933dd",
+      "7b4a8e38632a00fa94c4de36e626c49b5b0fbd8c",
       [
        null,
        {
@@ -413137,7 +415167,7 @@
       ]
      ],
      "scroll-behavior-subframe-window.html": [
-      "0a8ed39d1b97d493e9f8ffe0710e711afa491f43",
+      "ef587fea49cb1074b9d47f0b6d3db5ee87f2e702",
       [
        null,
        {
@@ -413850,7 +415880,7 @@
       ]
      ],
      "prefers-contrast.html": [
-      "617e0b97256db36b4b84024251c01e48a1400a79",
+      "fe0d2f057c31c8bd122483c8e282bc1188fc2a69",
       [
        null,
        {}
@@ -414200,7 +416230,7 @@
       ]
      ],
      "focus-visible-007.html": [
-      "2dcb3e34b21fb7251d5df0a85b00e9ca77f872f1",
+      "95a27006e62076909f63f9946e1f2d7f8331732a",
       [
        null,
        {
@@ -414223,7 +416253,7 @@
       ]
      ],
      "focus-visible-011.html": [
-      "f95458fc4d3e4a538ecf8788b87528a9a138db5c",
+      "0c05c21800d10042c00e67aad90fd867b515b4b2",
       [
        null,
        {
@@ -414729,7 +416759,7 @@
    },
    "custom-elements": {
     "CustomElementRegistry.html": [
-     "cc81e3a2cd3945ceac4ff461b14903c3901b1ba4",
+     "15d983f1c49409c2afff240402fc4fad08820610",
      [
       null,
       {}
@@ -415627,6 +417657,13 @@
    },
    "document-policy": {
     "experimental-features": {
+     "document-write.tentative.html": [
+      "551703c6f56b74856e2b7b465760fc57c2fe95dc",
+      [
+       null,
+       {}
+      ]
+     ],
      "layout-animations-disabled-tentative.html": [
       "fd32ace78e21de9bf8a36a8ae57df9a09f47e360",
       [
@@ -415657,6 +417694,13 @@
        {}
       ]
      ],
+     "sync-script.tentative.https.sub.html": [
+      "a199a4ed3f9a80c723ebf67551893429d15e86a9",
+      [
+       null,
+       {}
+      ]
+     ],
      "unsized-media.tentative.https.sub.html": [
       "d7bb72524902cbd519d892b8206569d7607a120b",
       [
@@ -415682,28 +417726,42 @@
      ]
     },
     "reporting": {
-     "oversized-images-reporting.html": [
+     "document-write-report-only-tentative.html": [
+      "bf17807f4a98e8bcbb227de51d69a640b5386c28",
+      [
+       null,
+       {}
+      ]
+     ],
+     "document-write-reporting-tentative.html": [
+      "65a584ce19d9c9acffd3c1cbfd05f0fac754a35a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "lossy-images-max-bpp-reporting-onload-tentative.html": [
+      "85e1349a19f7b8569a78f601952b850cd839bd52",
+      [
+       null,
+       {}
+      ]
+     ],
+     "lossy-images-max-bpp-reporting-tentative.html": [
+      "b6876f4880f4b985cde0e6871f95b03adb0ebde4",
+      [
+       null,
+       {}
+      ]
+     ],
+     "oversized-images-reporting-tentative.html": [
       "bef7db27a7ad821a5aa57164d407558b669c494f",
       [
        null,
        {}
       ]
      ],
-     "unoptimized-lossy-images-reporting-onload.html": [
-      "948c43522567df041fde2bcad1ea5d8d450410d2",
-      [
-       null,
-       {}
-      ]
-     ],
-     "unoptimized-lossy-images-reporting.html": [
-      "d4b8611a19d097668624edb687c4da491db6ba6b",
-      [
-       null,
-       {}
-      ]
-     ],
-     "unsized-media-reporting.html": [
+     "unsized-media-reporting-tentative.html": [
       "47a36436464e031e18f710330106694b7fa0c182",
       [
        null,
@@ -415713,7 +417771,7 @@
     },
     "required-policy": {
      "document-policy.html": [
-      "b7fbceb2acd3c798d04b0bf9651b9499f2c6ca9f",
+      "aaa8d6920018efd0b3871cc46f201887fdaeec37",
       [
        null,
        {}
@@ -415727,21 +417785,21 @@
       ]
      ],
      "required-document-policy-nested.html": [
-      "15281fcc2877538616e11d76d4628aa529c94239",
+      "33de2533a25517943a4ad7c2594d8fe03d1df485",
       [
        null,
        {}
       ]
      ],
      "required-document-policy.html": [
-      "99b64efab343a8d6ef5d489d67659484e240ef0b",
+      "1058e3582abd836958ecc9d075fc18f76a77f95c",
       [
        null,
        {}
       ]
      ],
      "separate-document-policies.html": [
-      "347d0a9d92c3e767e51d79ea1c0f0101fdb3030a",
+      "1ed94a81e74236305a32a0b4c58106c41be17376",
       [
        null,
        {}
@@ -415921,7 +417979,14 @@
       ]
      ],
      "Event-dispatch-click.html": [
-      "4b07103027139b4d7679da4e50eb3d82ab8b12d2",
+      "148f4f50d417068720088970bda86335e747bb16",
+      [
+       null,
+       {}
+      ]
+     ],
+     "Event-dispatch-click.tentative.html": [
+      "01ce1936a8b74a8c80c87beb59247ad629bce6c4",
       [
        null,
        {}
@@ -419071,6 +421136,13 @@
        {}
       ]
      ],
+     "recursive-exec-command-calls.tentative.html": [
+      "60a3b03099f358cf88e8e10c67347d9322cc9124",
+      [
+       null,
+       {}
+      ]
+     ],
      "restoration.html": [
       "4c53008b41027c4e11734dea068a57ea0e7283db",
       [
@@ -431752,11 +433824,22 @@
     ]
    },
    "entries-api": {
-    "idlharness.html": [
-     "091549eb2dcb57e1484b88c56b48021be545ced4",
+    "idlharness.window.js": [
+     "32527be514ad92a1c9d606a18cfae0061c764710",
      [
-      null,
-      {}
+      "entries-api/idlharness.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
      ]
     ]
    },
@@ -432562,13 +434645,6 @@
       {}
      ]
     ],
-    "idlharness.html": [
-     "2935927fd325f1de6624136e79e311138ad5dce9",
-     [
-      null,
-      {}
-     ]
-    ],
     "request-accept.htm": [
      "6032cb6ff35589d195705424907f6c7cde09251b",
      [
@@ -432660,13 +434736,6 @@
    },
    "feature-policy": {
     "experimental-features": {
-     "document-write.tentative.html": [
-      "7e09ef7e77a632f81fcc115271c9a74143bd34a7",
-      [
-       null,
-       {}
-      ]
-     ],
      "focus-without-user-activation-disabled-tentative.html": [
       "c4413f7804fcd6cebe4c5ecd576d25af763c4a35",
       [
@@ -432681,13 +434750,6 @@
        {}
       ]
      ],
-     "sync-script.tentative.https.sub.html": [
-      "94f0dcf13fcf9453d8460bbd2102479974ac9c6e",
-      [
-       null,
-       {}
-      ]
-     ],
      "trust-token-redemption-default-feature-policy.tentative.https.sub.html": [
       "d88048953ea3f1d26dee502ef331bc3f07ec0152",
       [
@@ -432995,20 +435057,6 @@
        {}
       ]
      ],
-     "document-write-report-only.html": [
-      "69ce9f82298641c17ce6d0b8e6c2fdf5bec08947",
-      [
-       null,
-       {}
-      ]
-     ],
-     "document-write-reporting.html": [
-      "50af640e08e9f44bcc0f45590a172f11321dd9cd",
-      [
-       null,
-       {}
-      ]
-     ],
      "encrypted-media-report-only.https.html": [
       "9ab4b0fe8569db905d44e7482bda5ad9804f3d28",
       [
@@ -433708,6 +435756,17 @@
         {}
        ]
       ],
+      "request-headers-nonascii.any.js": [
+       "0d822fb24f3e0c091acc3792339c975c9a129e53",
+       [
+        "fetch/api/basic/request-headers-nonascii.any.html",
+        {}
+       ],
+       [
+        "fetch/api/basic/request-headers-nonascii.any.worker.html",
+        {}
+       ]
+      ],
       "request-headers.any.js": [
        "4ba70f7c496b7c406e5ed1aef35ba5efb3dc46ef",
        [
@@ -435656,7 +437715,7 @@
        ]
       ],
       "request-structure.html": [
-       "806606cf627c115aad4c3fd89d4cc2377a3c8a61",
+       "e137a7ea5120ff24de310020fe330a6725cdb9d7",
        [
         null,
         {}
@@ -435680,6 +437739,13 @@
         ]
        ]
       },
+      "response-body-read-task-handling.html": [
+       "c2c90eaa8bd951cf7d5168e7796dd1cb8dcf9cde",
+       [
+        null,
+        {}
+       ]
+      ],
       "response-cancel-stream.html": [
        "fcaed04d83e31a437695b55b50beb7425a5a3fb8",
        [
@@ -436408,6 +438474,15 @@
        }
       ]
      ],
+     "cache-mode.html": [
+      "ea5bbad01889de63c2851b53ea50c0ded622431e",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "cc-request.html": [
       "e732683d7de1cb914e687e25b902a34e5e462c0c",
       [
@@ -436505,8 +438580,8 @@
        }
       ]
      ],
-     "embed.https.sub.html": [
-      "8a59b821b45544848279035921df041b9d63c033",
+     "embed.https.sub.tentative.html": [
+      "1900dbdf08139c00822f4545425cbe52d35ef562",
       [
        null,
        {}
@@ -436615,7 +438690,7 @@
       ]
      ],
      "portal.https.sub.html": [
-      "8403a296fe12786bf75675cde47f4d41b684cdaf",
+      "55b555a1b8ec4498f9dc897e3f64f09a2d61df93",
       [
        null,
        {
@@ -436916,7 +438991,7 @@
       ]
      ],
      "sw.https.window.js": [
-      "625e513a8133acbd09c838670bef17b89cb745e1",
+      "76f80e9416c615417ad2a9fbaa565641ff5b8a12",
       [
        "fetch/range/sw.https.window.html",
        {
@@ -437020,7 +439095,7 @@
       ]
      ],
      "stale-image.html": [
-      "f90e293bc40c9fd2a06dc8e346080ef682bb5423",
+      "d86bdfbde2cf84ba6ec5b7410adba0497b0ba3cc",
       [
        null,
        {}
@@ -437044,9 +439119,63 @@
      ]
     ]
    },
+   "font-access": {
+    "font_access-blob.tentative.https.window.js": [
+     "ff90075c966932f8a5be8bf0cf109934f37f6837",
+     [
+      "font-access/font_access-blob.tentative.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ],
+        [
+         "script",
+         "resources/test-expectations.js"
+        ],
+        [
+         "script",
+         "resources/window-tests-blob.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "font_access-enumeration.tentative.https.window.js": [
+     "677fe82c70233de2e1cbeab4beb41437319688b3",
+     [
+      "font-access/font_access-enumeration.tentative.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ],
+        [
+         "script",
+         "resources/test-expectations.js"
+        ],
+        [
+         "script",
+         "resources/window-tests-enumeration.js"
+        ]
+       ]
+      }
+     ]
+    ]
+   },
    "forced-colors-mode": {
     "forced-colors-mode-03.html": [
-     "ebe42e4e7502a327849fe2c65924480e00de4399",
+     "e7bb021217ce4a868a4bdfbaf194f7374885fc14",
      [
       null,
       {}
@@ -437100,6 +439229,13 @@
       null,
       {}
      ]
+    ],
+    "forced-colors-mode-32.html": [
+     "bd3595bf3bf33d5c65210c2f155a2431ef976e44",
+     [
+      null,
+      {}
+     ]
     ]
    },
    "fullscreen": {
@@ -437135,7 +439271,7 @@
       ]
      ],
      "document-fullscreen-enabled.html": [
-      "8c7057b430cc5125e5905116cc3d2fa57b452e3b",
+      "40430d7bbfbaf9425f45965819ef8b2407cb2c9c",
       [
        null,
        {}
@@ -438038,7 +440174,7 @@
         ]
        ],
        "010.html": [
-        "f1749decc69048fa318bd071648d6b3d89afe8f8",
+        "585cddc48e54bebdb8663593c9d9648de642f029",
         [
          null,
          {}
@@ -438135,6 +440271,13 @@
          {}
         ]
        ],
+       "failure-check-sequence.https.html": [
+        "5d7aa2b9cbbf8a0a2aebe3f1af3e10dd38d5f1a7",
+        [
+         null,
+         {}
+        ]
+       ],
        "javascript-url-abort": {
         "javascript-url-abort-return-value-string.tentative.html": [
          "f626a79ae66ab4502e611f4c713c2240d1a12722",
@@ -439471,7 +441614,7 @@
         ]
        ],
        "cross-origin-objects.html": [
-        "1d4560601b79cb14eba85862e898ec3eab5bc160",
+        "3b7c7832d7e7f215ccc810ae583f8cfdf925d497",
         [
          null,
          {
@@ -440002,7 +442145,7 @@
        ]
       ],
       "proxy-getOwnPropertyDescriptor.html": [
-       "c3db82f8502e8a6c989204449a6e4ac960a46681",
+       "88032fa18d50ebc9668119fab80a6b089075a027",
        [
         null,
         {}
@@ -444044,14 +446187,14 @@
          ]
         ],
         "canvas-createImageBitmap-e_srgb.html": [
-         "fd9a5e96d1f635b45cf6bacfa1697590ba6361fb",
+         "7483800b41e5ebafabcf1bfd204f5215edc1f158",
          [
           null,
           {}
          ]
         ],
         "canvas-createPutGetImageData-colorManaged.html": [
-         "a6b202e8f2bd671ce5074146d127abf6d2baf910",
+         "f153a983d93d5ee33893fd23340dfcc5b26e098a",
          [
           null,
           {}
@@ -444079,21 +446222,14 @@
          ]
         ],
         "canvas-getImageData-e_srgb.html": [
-         "f5f0e629dd19f4d65531b15bf39595e587ded974",
+         "c38da7c95c0d48fd009c9073697f0232379918f9",
          [
           null,
           {}
          ]
         ],
         "imageData-colorManagedBehavior.html": [
-         "6bc55b7ca70e9cc0fe28e4e0f27a5e094fd725cb",
-         [
-          null,
-          {}
-         ]
-        ],
-        "imageData-colorSpace.html": [
-         "9023cbea3620686b04aeed15120284bdf9a41478",
+         "dda9f9cc28f051114f21b27fe470aafe1ce2b06e",
          [
           null,
           {}
@@ -452180,7 +454316,7 @@
        },
        "the-offscreen-canvas": {
         "offscreencanvas.commit.html": [
-         "35cba368116db58cbcb3cdcb9e244a18dbda8650",
+         "fa0e2ac5fc8b73d316599d8147c039751fd1da3d",
          [
           null,
           {}
@@ -457570,7 +459706,7 @@
       ]
      ],
      "cache-storage-reporting-dedicated-worker.https.html": [
-      "d88bf56ec2cb16dc3ab03035a0bdf15f10f54c04",
+      "f4b2599141a786c9573991467a126d59c9cc3fd5",
       [
        null,
        {
@@ -457579,7 +459715,7 @@
       ]
      ],
      "cache-storage-reporting-document.https.html": [
-      "efb7e7a779587de7f5c142383d36470a54908f5c",
+      "b998ba7926eece4a75180be05f069636f895683e",
       [
        null,
        {
@@ -457588,14 +459724,14 @@
       ]
      ],
      "cache-storage-reporting-service-worker.https.html": [
-      "b9ec8d95a59ade8a8120a0af04248d3c930c1dac",
+      "96a328b2cc1922a45a1ad5e24aee9d79ab1979b3",
       [
        null,
        {}
       ]
      ],
      "cache-storage-reporting-shared-worker.https.html": [
-      "d7bd191a84e9c2e5b766ea258ac615791471fb95",
+      "34af988fc65f50cc0cec48e0cdbcba1c1546367d",
       [
        null,
        {
@@ -457617,6 +459753,13 @@
        {}
       ]
      ],
+     "cross-origin-isolated-permission.https.html": [
+      "da3a632a3c3707a164e1f3fd3f961bf3ed5aac22",
+      [
+       null,
+       {}
+      ]
+     ],
      "data.https.html": [
       "f2878dfc5491725dd85c8db440ab63bc5aaee3a3",
       [
@@ -457638,6 +459781,15 @@
        {}
       ]
      ],
+     "header-parsing.https.html": [
+      "6da000d7ededd87bc2cfbfce4741bada621609e9",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "javascript.https.html": [
       "60edf00312dd46efcb8d542bdccb1f669181efca",
       [
@@ -457674,21 +459826,21 @@
       ]
      ],
      "none-sw-from-none.https.html": [
-      "deb046cdb37559025ea42b72914814eef163c20c",
+      "b539561effd93df24734d25f1f0fc61a50498adf",
       [
        null,
        {}
       ]
      ],
      "none-sw-from-require-corp.https.html": [
-      "88c0d2cf6fb06b34711d19621579f9d7faf087d8",
+      "36cf4a153bfa7b5db387dcb2cbff46eea7f94a25",
       [
        null,
        {}
       ]
      ],
      "none.https.html": [
-      "0fbd4165a5f19f19a4e6cca3ee43bba88f0336b5",
+      "24b1fce1764d74a01c4eeb21c3d9e05de1bb12ba",
       [
        null,
        {
@@ -457706,7 +459858,7 @@
       ]
      ],
      "reporting-navigation.https.html": [
-      "7087985990e6823b0f7b1bcb22e57b25a753d605",
+      "680cc6af29a4b5f546179dfa7652a0ddf1fe687a",
       [
        null,
        {
@@ -457715,7 +459867,7 @@
       ]
      ],
      "reporting-subresource-corp.https.html": [
-      "5314ec93550f2641dd249b9e912a6c3688f3ab0c",
+      "ad8a8e99eb99e6ec92c8d40dfad0324365fbe6ac",
       [
        null,
        {
@@ -457724,7 +459876,7 @@
       ]
      ],
      "reporting-to-endpoint.https.html": [
-      "cfff7bcb9e8aac12a210a657418fe0a78156e93b",
+      "02c719da7372555386e89cb159910bf13e3900ff",
       [
        null,
        {
@@ -457754,14 +459906,14 @@
       ]
      ],
      "require-corp-sw-from-none.https.html": [
-      "adb73bfba45bfee3eaaa3516482424189ac8c493",
+      "a60b8bd457ea0af21c882bf37f0f107c1065026e",
       [
        null,
        {}
       ]
      ],
      "require-corp-sw-from-require-corp.https.html": [
-      "0696b7a33cc2a6c22bc631d67c443ef72392f718",
+      "deefc92b804c60559fe1c3a4b43feecba17bb6a9",
       [
        null,
        {}
@@ -457859,6 +460011,20 @@
        }
       ]
      ],
+     "coop-csp-sandbox-navigate.https.html": [
+      "bd3a55a2d8fdb046c66abb9da51abd433104dbe8",
+      [
+       null,
+       {}
+      ]
+     ],
+     "coop-csp-sandbox.https.html": [
+      "259d484df2cbf708a14e7c73e1f6dedde3dbb732",
+      [
+       null,
+       {}
+      ]
+     ],
      "coop-navigated-history-popup.https.html": [
       "a061be992c1aa05ba8b0c1290f3562ab9a88904e",
       [
@@ -457876,7 +460042,14 @@
       ]
      ],
      "coop-sandbox.https.html": [
-      "ceb744c215bcc2fcdf9a0a81d6e3820d4efd49eb",
+      "6f250c1b0920808f519ee1278920215981fcd5e6",
+      [
+       null,
+       {}
+      ]
+     ],
+     "header-parsing.https.html": [
+      "2839c381b807efa2ab934b2ff66c932d5f179e9f",
       [
        null,
        {}
@@ -458037,6 +460210,15 @@
        }
       ]
      ],
+     "javascript-url.https.html": [
+      "a10c939ed50cce5426e8e8127c4c6e2e86dfa381",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "no-https.html": [
       "db15d5c676efb6f5761dec52ad56580fdfc1acbf",
       [
@@ -458211,8 +460393,8 @@
      ],
      "reporting": {
       "access-reporting": {
-       "openee-accessed_openee-coop-ro.https.html": [
-        "1deedbde77b72fd732c2f7c7c611d1adfc7235e9",
+       "access-from-coop-page-to-openee_coop-ro.https.html": [
+        "fc7c192b6b69303067c01ee407a67e9eed9201d2",
         [
          null,
          {
@@ -458220,8 +460402,8 @@
          }
         ]
        ],
-       "openee-accessed_opener-coop-ro.https.html": [
-        "8b6e7caed75640c6715ecfab8ef3b90de8b438cc",
+       "access-from-coop-page-to-opener_coop-ro.https.html": [
+        "d7384e21195c16e558fe85fadfaca45e56c149cb",
         [
          null,
          {
@@ -458229,8 +460411,8 @@
          }
         ]
        ],
-       "opener-accessed_openee-coop-ro.https.html": [
-        "6c576def93ab4c029b1719f0bbfd115e30ab1c56",
+       "access-from-coop-page-to-other_coop-ro.https.html": [
+        "e5cc726c5e0b38c8d25cd3ee8fb80f227e1c3e19",
         [
          null,
          {
@@ -458238,8 +460420,26 @@
          }
         ]
        ],
-       "opener-accessed_opener-coop-ro.https.html": [
-        "b6883de249a19e4aeb15992c22d3f46c91b70b1b",
+       "access-to-coop-page-from-openee_coop-ro.https.html": [
+        "e54d5e3fe1c34113bd79849df4e3bfc16739d467",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "access-to-coop-page-from-opener_coop-ro.https.html": [
+        "ef969738c33f8cacc8a269f5159e60900f98a7c7",
+        [
+         null,
+         {
+          "timeout": "long"
+         }
+        ]
+       ],
+       "access-to-coop-page-from-other_coop-ro.https.html": [
+        "c349b9a708e7cb579db921cc1d574869dc0b081c",
         [
          null,
          {
@@ -458286,7 +460486,7 @@
       },
       "navigation-reporting": {
        "report-only-four-reports.https.html": [
-        "245df0439ea71413a59ffdf6c67b83624aa8e290",
+        "9cee968456549d6676c7f1a3560dea6d7b6a6833",
         [
          null,
          {
@@ -458295,7 +460495,7 @@
         ]
        ],
        "report-only-from-unsafe-none.https.html": [
-        "a9bd737c6dd722562517f55bad152e3fcd37290c",
+        "33aa08e2b6ac255830e66d63dba42f16b47f8371",
         [
          null,
          {
@@ -458304,7 +460504,7 @@
         ]
        ],
        "report-only-same-origin-report-to.https.html": [
-        "f66d19a239a9d9ed413657bca2e1c23ad72e1a77",
+        "484152cfb1c55053976d4935555cb7b47c3d97d6",
         [
          null,
          {
@@ -458331,7 +460531,7 @@
         ]
        ],
        "report-only-same-origin.https.html": [
-        "25124ef3d5e4f839447bf1e54e14b27e837ad533",
+        "ff3649fd3953f62801f724185e2a98a41685fca0",
         [
          null,
          {
@@ -458340,14 +460540,14 @@
         ]
        ],
        "reporting-coop-navigated-popup.https.html": [
-        "b2e28db349eff34e582e40daad2069c7f13999b0",
+        "dde4c40b38a1e541f66c47573fbd642f2e1e8289",
         [
          null,
          {}
         ]
        ],
        "reporting-popup-same-origin-allow-popups-report-to.https.html": [
-        "a8730b00cc6af19a5a02f825fbb0d92f5bce3aa0",
+        "576ab7d85beeed1ca230941723ad44511e405e2a",
         [
          null,
          {
@@ -458356,7 +460556,7 @@
         ]
        ],
        "reporting-popup-same-origin-coep-report-to.https.html": [
-        "51957b4ac19ed23f51d6be3685c96522d6b9391b",
+        "590ab3ff3f285f11e68b51c2d6b223172fad3239",
         [
          null,
          {
@@ -458365,7 +460565,7 @@
         ]
        ],
        "reporting-popup-same-origin-report-to.https.html": [
-        "6d3c6b41df155fc8237007ae4d6d87709a0ee795",
+        "6c929b0f8c1ae1bb2eb033dc67e6e22dedc3abb9",
         [
          null,
          {
@@ -458374,7 +460574,7 @@
         ]
        ],
        "reporting-popup-same-origin.https.html": [
-        "ec39a568bbd197d0f65e9d40f7c25001c7e8adb6",
+        "2fa4e023893ce5b4647b302aa5414024927c3e59",
         [
          null,
          {
@@ -458383,7 +460583,7 @@
         ]
        ],
        "reporting-popup-unsafe-none-report-to.https.html": [
-        "a4eaec15bbe5cc23bf0e250f8178809fe86729c9",
+        "05bb150d856eed98ffdaf7648f0e00fe1c5daa71",
         [
          null,
          {
@@ -458392,7 +460592,7 @@
         ]
        ],
        "reporting-redirect-with-same-origin-allow-popups.https.html": [
-        "f2f06efd628107108976ffc28ab33db7c13bb05a",
+        "3b513371b0257b8d380c7db44cfcc3b7ace1217a",
         [
          null,
          {
@@ -458401,7 +460601,14 @@
         ]
        ]
       }
-     }
+     },
+     "resource-popup.https.html": [
+      "481cceb72f0d0ab47f79dc0cdf84ad442a420509",
+      [
+       null,
+       {}
+      ]
+     ]
     },
     "dom": {
      "documents": {
@@ -459049,6 +461256,15 @@
         ]
        ]
       },
+      "images": {
+       "bypass-cache-revalidation.html": [
+        "38cdd876da1b188c6cf276b1e7c8ef3eb57d4bb1",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "name-content-attribute-and-property.html": [
        "bcfbd29c33c1e8e68c6f712ad7e2f3ded8cc6686",
        [
@@ -459095,7 +461311,7 @@
       ]
      ],
      "idlharness.https.html": [
-      "05b1f69ebb91c9a5789f28b4508648c62644f2c9",
+      "d79e09b46affacf4f981152109e11e8bd44eb158",
       [
        "html/dom/idlharness.https.html?exclude=(Document|Window|HTML.*)",
        {
@@ -459116,7 +461332,7 @@
       ]
      ],
      "idlharness.worker.js": [
-      "feddaf54c9235dbb766f79990f729c8e441cbbec",
+      "872657d383cc5dbe43c26a3c05d5a64bc7c6e2d4",
       [
        "html/dom/idlharness.worker.html",
        {}
@@ -461106,6 +463322,13 @@
          {}
         ]
        ],
+       "fieldset-overflow-cssomview.html": [
+        "c47c7cdd5d51c1fd9f508f927d1a2293af0dfcbb",
+        [
+         null,
+         {}
+        ]
+       ],
        "fieldset-percentage-block-size.html": [
         "1c221555c305bd9039558389b3f22ee00d65f8b9",
         [
@@ -463443,6 +465666,13 @@
            ]
           ]
          },
+         "no-cuechange-before-play.html": [
+          "cd53914ecd574f280247af4b35f1e336f269bf37",
+          [
+           null,
+           {}
+          ]
+         ],
          "src-clear-cues.html": [
           "3ba8c9db88a4952a9be5879e4652799f6b5c18db",
           [
@@ -463458,7 +465688,7 @@
           ]
          ],
          "track-active-cues.html": [
-          "501cf3f92a2796c2685a046829593821d7414b2c",
+          "a7c08a2e3eac26bc81ef60da9e6e84fdf99b7f3b",
           [
            null,
            {}
@@ -466080,6 +468310,13 @@
         ]
        ],
        "sizes": {
+        "implicit-sizes-ignores-width.html": [
+         "db61db351eacb5f38ce6767a55a61e588f5580e5",
+         [
+          null,
+          {}
+         ]
+        ],
         "parse-a-sizes-attribute-display-none.html": [
          "6aa77ebf85b9de2757e80abb32c32fd2c8021958",
          [
@@ -467229,12 +469466,21 @@
         ]
        ],
        "datetime.html": [
-        "52cb3c0697b08176c793fb7ed0b18a431e89cfb3",
+        "38ac00fbf0f3e6af3d69fe001bbfdd1be734a088",
         [
          null,
          {}
         ]
        ],
+       "defaultValue-clobbering.html": [
+        "41ff967c190616c7312c967c24541382aa20c20e",
+        [
+         null,
+         {
+          "testdriver": true
+         }
+        ]
+       ],
        "email.html": [
         "fc92529efafb65166f86014b123b87285603f437",
         [
@@ -467504,7 +469750,7 @@
         ]
        ],
        "range.html": [
-        "209ce25306e02986238ae26fb6fdf38b0a26a500",
+        "577611bb802552a04cb493139bc5f8e8deac912c",
         [
          null,
          {}
@@ -467525,7 +469771,7 @@
         ]
        ],
        "search_input.html": [
-        "175cdde99a339a29e41d4305424b39332e9b4953",
+        "7b63cd43e1b46e14b7f7ebad127182012bea421b",
         [
          null,
          {}
@@ -471403,7 +473649,7 @@
          ]
         ],
         "template-as-a-descendant.html": [
-         "8ad6532172c948ed4ab9a1617074ee99115080af",
+         "caa1beab47ae8005c951c91d2308dff19c836048",
          [
           null,
           {}
@@ -473240,21 +475486,21 @@
        },
        "clearing-the-stack-back-to-a-given-context": {
         "clearing-stack-back-to-a-table-body-context.html": [
-         "a150faa1d7ee85091e46c0315c0f1472c7e90507",
+         "2e7d5408214c057cf75f2d2080e71b8cbd35c5b7",
          [
           null,
           {}
          ]
         ],
         "clearing-stack-back-to-a-table-context.html": [
-         "23a4e7b0bbf3873694d5544865af06e3ee949a02",
+         "b805d3c9f9921bc4e0e92c035ca066df8f27c6d2",
          [
           null,
           {}
          ]
         ],
         "clearing-stack-back-to-a-table-row-context.html": [
-         "25039161261054bb3a164366e6416acfb6ac459c",
+         "d213c0fbddf9d71d166adfb4459119df263dfa0f",
          [
           null,
           {}
@@ -473263,7 +475509,7 @@
        },
        "creating-an-element-for-the-token": {
         "template-owner-document.html": [
-         "bec3364adffec6c3ea66fb3e3f5bcaa6d244a3da",
+         "6738a6fde55a1d656ad498a756025624e3961f4a",
          [
           null,
           {
@@ -474644,6 +476890,13 @@
          {}
         ]
        ],
+       "pageshow-event.window.js": [
+        "45570b35abf2232476d9cb93f294ce68362e5646",
+        [
+         "html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.html",
+         {}
+        ]
+       ],
        "quirks.window.js": [
         "0ff0bb99443677b8f8844c8ecedef22c408f2bac",
         [
@@ -475543,7 +477796,14 @@
         ]
        ],
        "protocol.https.html": [
-        "f4dca7d69d7e49bc8564d62007c6062e79b994b7",
+        "bb27ed704f5777ab7358a31d6839269b4a2e346d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "protocol.tentative.https.html": [
+        "0120aaa12ff87482e3dd116e71fec66e6aeca7db",
         [
          null,
          {}
@@ -475772,7 +478032,7 @@
      ]
     ],
     "idlharness.https.window.js": [
-     "dec8fee98825732d578a57db3194cef079e1c54b",
+     "f2b32d8183b924bb5a9588a3339fa76a3ab067c9",
      [
       "idle-detection/idlharness.https.window.html",
       {
@@ -475798,7 +478058,7 @@
      ]
     ],
     "interceptor.https.html": [
-     "31acf2829f2f778686dcd83dc07f5be1713af91d",
+     "e597bd3e94e85d0b67b9aceaa60c56f2159e9045",
      [
       null,
       {
@@ -476777,7 +479037,7 @@
      ]
     ],
     "input-events-get-target-ranges-backspace.tentative.html": [
-     "cf512269b07e0177214f7d9059150a77b85eb225",
+     "11b1830efb9fa7680069fa0a3d28efa0b048a36d",
      [
       null,
       {
@@ -476786,7 +479046,7 @@
      ]
     ],
     "input-events-get-target-ranges-forwarddelete.tentative.html": [
-     "3780324cf92bfa0c712045d89e43e903e3a1c9c6",
+     "b31afacb62dfca8b42734d098f9448086222ecc0",
      [
       null,
       {
@@ -477016,7 +479276,7 @@
      ]
     ],
     "observer-attributes.html": [
-     "4e2e5293c7cdfb120beb075e3e1ad8bf9edc6977",
+     "9d0b788b331313046045bac564ae18887b02533f",
      [
       null,
       {}
@@ -477330,7 +479590,110 @@
        ]
       }
      ]
-    ]
+    ],
+    "security": {
+     "cross-origin-subframe-complex-clip.sub.html": [
+      "0bbe9c078204b2448e9527dbd2a2afbfa6234c2f",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-masked-complex-clip.sub.html": [
+      "e5a3d310a9aec3816e79374c302008527f388f2a",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-masked-pointer-events-mixed-2.sub.html": [
+      "55cbc48b7d31cd84d768fd7e8f929a9779fe700d",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-masked-pointer-events-mixed.sub.html": [
+      "b0363682ef4158e565fb8de3681ac1af7909e45f",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-masked-pointer-events-none.sub.html": [
+      "a3f971cdfd2ef1d6e8d0318205124a41a4023104",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-overlap.sub.html": [
+      "377eedbf35e2c2e81f61a65dd754f5fc08ab0a6f",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-pointer-events-none.sub.html": [
+      "371a92866a6353c928cbf2a47c599ac3fec1fa86",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe-transformed.sub.html": [
+      "5dac5aa36b37c1bd893703662c55ee2879a87187",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "cross-origin-subframe.sub.html": [
+      "d513fa94fc451861504700daa5dd177ae090b2ca",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ]
+    },
+    "tentative": {
+     "same-origin-subframe.sub.html": [
+      "ee85bc4d06ec1a45d672f4ea5a0ce6dff930b20a",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
+     "toplevel.html": [
+      "4b60571d53c4c0144799c84a1f4fe34b38eb471e",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ]
+    }
    },
    "js": {
     "behaviours": {
@@ -477433,7 +479796,184 @@
        null,
        {}
       ]
-     ]
+     ],
+     "weakrefs": {
+      "cleanup-prevented-with-reference.optional.any.js": [
+       "5095ca7d41ee6fd5fb1b143bc2755a3af0551c01",
+       [
+        "js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "cleanup-prevented-with-unregister.optional.any.js": [
+       "0dcfcbfbd02eb0984bcca31360264099c1e1f84f",
+       [
+        "js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "gc-has-one-chance-to-call-cleanupCallback.optional.any.js": [
+       "9a1d0a5c1a831c797051c8578f8b73c7db6b6c3d",
+       [
+        "js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "holdings-multiple-values.optional.any.js": [
+       "591a94d35a12f441bd75e204ba1b25b7e79064b7",
+       [
+        "js/builtins/weakrefs/holdings-multiple-values.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/holdings-multiple-values.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "reentrancy.optional.any.js": [
+       "b332b2823229d3adba80075e292e86dd121be1d9",
+       [
+        "js/builtins/weakrefs/reentrancy.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/reentrancy.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "return-undefined-with-gc.optional.any.js": [
+       "2ec75a0ccf1dcafa735b71658fb101e245233458",
+       [
+        "js/builtins/weakrefs/return-undefined-with-gc.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/return-undefined-with-gc.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ],
+      "unregister-cleaned-up-cell.optional.any.js": [
+       "c653108cb1268aa226523dac10ad34f212218bc9",
+       [
+        "js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "resources/maybe-garbage-collect.js"
+          ]
+         ]
+        }
+       ]
+      ]
+     }
     }
    },
    "js-self-profiling": {
@@ -477878,8 +480418,15 @@
       {}
      ]
     ],
+    "inline-flow-shift-one-line.html": [
+     "0c477e0e9802799ef48ef1afda8d387942a1bdff",
+     [
+      null,
+      {}
+     ]
+    ],
     "inline-flow-shift-vertical-rl.html": [
-     "a89cad145b277bb7a92b30781a63de18fb76c42f",
+     "848883755c75fc38354e52360a8fdb92962b3a49",
      [
       null,
       {}
@@ -478405,7 +480952,7 @@
        ]
       ],
       "mpadded-003.html": [
-       "4df55b993694b7661a613034dcddfc92712df970",
+       "84afe23455a8b6471cd8722e03cfc7ddfc48a11c",
        [
         null,
         {}
@@ -478900,14 +481447,14 @@
        ]
       ],
       "underover-parameters-3.html": [
-       "a09e2cbca32efc40f41de2924a382757a765a280",
+       "80ca630a080b6cd8f50a0752535b9b67ec93ee89",
        [
         null,
         {}
        ]
       ],
-      "underover-parameters-4.html": [
-       "8df0f4d8ef84b26618185830253cc80b8df493c6",
+      "underover-parameters-4.tentative.html": [
+       "f7c968dd34300becc9ae1311d8aadc6919eb746c",
        [
         null,
         {}
@@ -479054,6 +481601,13 @@
         {}
        ]
       ],
+      "multi-column-layout.html": [
+       "d914fe780f4383bcbc68c73a15fb5f7ad6755da1",
+       [
+        null,
+        {}
+       ]
+      ],
       "not-participating-to-parent-layout.html": [
        "52d41547ce2c5cad8ea831133f08bca572f03d5f",
        [
@@ -479158,6 +481712,13 @@
         {}
        ]
       ],
+      "content-editable.html": [
+       "be107453eb9ef0b597bed4e076b82354b1145807",
+       [
+        null,
+        {}
+       ]
+      ],
       "css-inline-style-interface.tentative.html": [
        "b82f98e28b70cbfbadf7f585c9a2c8a2612ba05f",
        [
@@ -479209,8 +481770,15 @@
         {}
        ]
       ],
+      "integration-point-5.html": [
+       "dc10b46b9488cb2bc2c1bde80125dcc26ec83e8c",
+       [
+        null,
+        {}
+       ]
+      ],
       "math-global-event-handlers.tentative.html": [
-       "7bbdee261105d91f74b0880cd045a35b641745bf",
+       "e464c8300e47e75fc89722b5191cae813b0e7bda",
        [
         null,
         {}
@@ -480723,7 +483291,7 @@
      ]
     ],
     "MediaStreamTrack-getSettings.https.html": [
-     "d94b43c9cf9a137d2520fbf69622a62011220a46",
+     "8d8dd7b71bdce8d0b45145a1de3271ce00069380",
      [
       null,
       {
@@ -482460,7 +485028,7 @@
    },
    "native-file-system": {
     "idlharness.https.any.js": [
-     "a9090baeee5a9a073513d5fdaae2d84d50d90556",
+     "9e7b52261ced9aef9a517b8db02788ce2e11ef6b",
      [
       "native-file-system/idlharness.https.any.html",
       {
@@ -482503,7 +485071,7 @@
      ]
     ],
     "opaque-origin.https.window.js": [
-     "a916592406e721ed16980236114a5eac266fc0bf",
+     "8f431a24062c11d9d4d90984e9b1580369dff001",
      [
       "native-file-system/opaque-origin.https.window.html",
       {}
@@ -483321,7 +485889,7 @@
      ]
     ],
     "showPicker-errors.https.window.js": [
-     "1f1d2edd63d0850622ff3260addfa1270a70084f",
+     "e8f0d3f540485120cd15d642b1b0d33110797098",
      [
       "native-file-system/showPicker-errors.https.window.html",
       {
@@ -483337,7 +485905,7 @@
    },
    "native-io": {
     "close_async.tentative.https.any.js": [
-     "0338cda62ddd2b6aa9678155bdb2318de0c31861",
+     "7545cedaffd1718b9f84742f21b3f9a4d5d89033",
      [
       "native-io/close_async.tentative.https.any.html",
       {
@@ -483400,7 +485968,7 @@
      ]
     ],
     "close_sync.tentative.https.any.js": [
-     "834265f2255a5fe129fca6d9897b836059660677",
+     "f2de6d571a4c2817f778fe145475e296ecde1c8b",
      [
       "native-io/close_sync.tentative.https.any.worker.html",
       {
@@ -483703,6 +486271,101 @@
        }
       ]
      ],
+     "concurrent_io_setLength_async.tentative.https.any.js": [
+      "cb7d6642c845f6b8c5c7f3d06e3e785e0ddc6644",
+      [
+       "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "NativeIO API: Concurrent io while setLength is resolving."
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "operation_helpers.js"
+         ],
+         [
+          "script",
+          "../resources/support.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "NativeIO API: Concurrent io while setLength is resolving."
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "operation_helpers.js"
+         ],
+         [
+          "script",
+          "../resources/support.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.sharedworker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "NativeIO API: Concurrent io while setLength is resolving."
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "operation_helpers.js"
+         ],
+         [
+          "script",
+          "../resources/support.js"
+         ]
+        ]
+       }
+      ],
+      [
+       "native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "title",
+          "NativeIO API: Concurrent io while setLength is resolving."
+         ],
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "operation_helpers.js"
+         ],
+         [
+          "script",
+          "../resources/support.js"
+         ]
+        ]
+       }
+      ]
+     ],
      "concurrent_io_write_async.tentative.https.any.js": [
       "0deb7652ee7f0a17693310443265b3a2d8d3a9b4",
       [
@@ -483981,6 +486644,107 @@
       }
      ]
     ],
+    "getLength_setLength_async_basic.tentative.https.any.js": [
+     "f99d2875fc0009ff49eb95dc9958402c08261189",
+     [
+      "native-io/getLength_setLength_async_basic.tentative.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Assigned length is observed back."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/getLength_setLength_async_basic.tentative.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Assigned length is observed back."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/getLength_setLength_async_basic.tentative.https.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Assigned length is observed back."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/getLength_setLength_async_basic.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Assigned length is observed back."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "getLength_setLength_sync_basic.tentative.https.any.js": [
+     "f65cd44510ef09c91e3e813f85001836050c36f7",
+     [
+      "native-io/getLength_setLength_sync_basic.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Synchronous NativeIO API: Assigned length is observed back."
+        ],
+        [
+         "global",
+         "dedicatedworker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "open_getAll_async_basic.tentative.https.any.js": [
      "0487ef5e2f2f2908b82d78994ba2675cf9e1c2df",
      [
@@ -484325,6 +487089,140 @@
       }
      ]
     ],
+    "setLength_bounds_async.tentative.https.any.js": [
+     "b00370c47f560803cc2da00a75cb14df3169f5c8",
+     [
+      "native-io/setLength_bounds_async.tentative.https.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Out-of-bounds errors for setLength."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/setLength_bounds_async.tentative.https.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Out-of-bounds errors for setLength."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/setLength_bounds_async.tentative.https.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Out-of-bounds errors for setLength."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/setLength_bounds_async.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Out-of-bounds errors for setLength."
+        ],
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "setLength_bounds_sync.tentative.https.any.js": [
+     "d95752fdd8e5fb292071c4853b886b5b1b65596a",
+     [
+      "native-io/setLength_bounds_sync.tentative.https.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "Synchronous NativeIO API: Out-of-bounds errors for setLength."
+        ],
+        [
+         "global",
+         "dedicatedworker"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "trustworthy_origin_failure.tentative.http.any.js": [
+     "ae01ac420158ef1f9633f8ef8f6c5f4e15d9cb0a",
+     [
+      "native-io/trustworthy_origin_failure.tentative.http.any.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Interface is not exposed in untrustworthy origin."
+        ],
+        [
+         "global",
+         "window,dedicatedworker"
+        ]
+       ]
+      }
+     ],
+     [
+      "native-io/trustworthy_origin_failure.tentative.http.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "title",
+         "NativeIO API: Interface is not exposed in untrustworthy origin."
+        ],
+        [
+         "global",
+         "window,dedicatedworker"
+        ]
+       ]
+      }
+     ]
+    ],
     "write_getLength_async_basic.tentative.https.any.js": [
      "bf886cca3973087527ef6eb747794d7dba72c28b",
      [
@@ -484430,7 +487328,7 @@
      ]
     ],
     "idlharness.window.js": [
-     "530a9058faa334aab29b8a6e87ca0a44d1286e18",
+     "72cf0c3a3d3c8cb77541625a0554d8464d7c112b",
      [
       "navigation-timing/idlharness.window.html",
       {
@@ -484502,7 +487400,7 @@
      ]
     ],
     "nav2_test_navigate_iframe.html": [
-     "0490610e01747f7e00bd0677f3023d3327e0e757",
+     "0c144bda454be86180bbfba503c4d1da945733e4",
      [
       null,
       {}
@@ -484600,7 +487498,7 @@
      ]
     ],
     "test_document_onload.html": [
-     "fd3855544999b8712a985aa49417171569c8cbd5",
+     "7cc18491d62024f1d4fa3d20c5173b313269b3e8",
      [
       null,
       {}
@@ -485447,77 +488345,77 @@
    "origin-isolation": {
     "1-iframe": {
      "parent-no-child-bad-subdomain.sub.https.html": [
-      "8c18711093ce9c44bb8882b1f86c769c516c0b5f",
+      "27085aa151ed219718a9538ba44f720ad20c62ca",
       [
        null,
        {}
       ]
      ],
      "parent-no-child-yes-port.sub.https.html": [
-      "10df411a96f9bf96c5f098c7fb8baced392d6a6a",
+      "d1466e55c04136f04263bd288f7299bf33ed5a15",
       [
        null,
        {}
       ]
      ],
      "parent-no-child-yes-same.sub.https.html": [
-      "034c8a3090b8e73e98d2927c88f69e7d1fb1e9b9",
+      "39d6cf996a842c6e84d9b8bec6a74dbf5d0e4a2b",
       [
        null,
        {}
       ]
      ],
      "parent-no-child-yes-subdomain.sub.https.html": [
-      "3894f560f04224e96a27239c7a6562d75a8c721c",
+      "648c641553cdd6d6f5a0f53ce4fc94f2314e2e11",
       [
        null,
        {}
       ]
      ],
      "parent-no-child-yeswithparams-subdomain.sub.https.html": [
-      "a47729bb03252d9d16c6dc1201c753800b8f416f",
+      "400a8f72332a2620c3957bfe1aa7d6b572c927e2",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child-no-port.sub.https.html": [
-      "09389e338abf5034da135b8d536cdc7a49d5c5da",
+      "793c47328e103c5f63677ebdaa6818b07ce0e198",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child-no-same.sub.https.html": [
-      "7070c1b891dc88eb38948fdf5e75a063c81f16ac",
+      "f1ca9a9a7cdec13d38b42abcc93f2eb9a57242a1",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child-no-subdomain.sub.https.html": [
-      "32e5a1768d85038329b03db6123110c96891a3cf",
+      "be84ecac2d1891554bab21ae4c12cdfb59f1ebf3",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child-yes-port.sub.https.html": [
-      "96669c30d14e3e2f85bc330cd58a132e6dd6087a",
+      "58516b86742e4ea3ccae560066bdf44a4fd80a9e",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child-yes-same.sub.https.html": [
-      "a83582f747a4fada06e37dd576ff9cc622492573",
+      "b08206b4478fceb24013abe39907dee5d2d95446",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child-yes-subdomain.sub.https.html": [
-      "7010e4c5f4f1a1549f644de752ef363a555133cc",
+      "9a426d068aef3b6115c803aa1e3828dbe6a2fbc9",
       [
        null,
        {}
@@ -485526,105 +488424,105 @@
     },
     "2-iframes": {
      "parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html": [
-      "a8437c5966fbe4764c1688ace68dc3163caf000a",
+      "55c158381275a4d63e43bf7dbb8b40c366e3ba55",
       [
        null,
        {}
       ]
      ],
      "parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html": [
-      "4103373df6c2b0ebded63e33115e9610e55affbf",
+      "2c0bb614b50b35dab4086dc35d360601570084ec",
       [
        null,
        {}
       ]
      ],
      "parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html": [
-      "06d58b3a9c40bbfe6111d108c873466993e6242e",
+      "e31af2061fb9ae5bb5000c7980c6637f391a444b",
       [
        null,
        {}
       ]
      ],
      "parent-no-child1-yes-subdomain-child2-no-port.sub.https.html": [
-      "68c9fe1aa6d541e9ed19e28ca0cfa2fafcf07b39",
+      "eaccc8509cdc4d8afb2d9144af15acb9fd67ef18",
       [
        null,
        {}
       ]
      ],
      "parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html": [
-      "4e95827ce680ac1b50d9f2178390fc55c305e88c",
+      "5adb911ae8b466125696caf0d828db43f66afdaa",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html": [
-      "f261b8eea2cc7af7e510aa34443789fe8c69c24f",
+      "e463f328f19d1c91f51c6494c182ece8ee8072ef",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html": [
-      "86c951dd826600c8ee15731b0ab0bd047e78dcb8",
+      "2d67979b68a355c0860847b9a4779cfa833647bf",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html": [
-      "997fa0859f1875d5bf12694d191d61f17fad266c",
+      "ecf759cde06706311e77c0244ca796906deec83d",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html": [
-      "7631bdd1bd4d16019e11a5118c7964ef2af2f5e4",
+      "0448076178aa3a2956e98116afa8bcad549cc5f6",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html": [
-      "e578e3502081e8445f88c483b6628a1fbb40fde3",
+      "1b14ca48ba730791c9128da85490c606dada3f3a",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html": [
-      "edcdcbabd76bb5b051a2caf7abc35126845e5bea",
+      "fcdb13699710bf8ba5aca0d15b0e2908d60e7af1",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html": [
-      "f8503312460b20e270063f87d6668d622c652023",
+      "011bcd1637b818b24d552f25fcfcd615c6e25528",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html": [
-      "6ae6fac77181e5c26c871c4245af05192d1069c7",
+      "1a4dd4c9a655b56c4c94a0b8297bc0faa711154c",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html": [
-      "53eaea13ca2420b11c6350147c40e27b3905db7b",
+      "852fd2d216e3be0f0b1b18606ad46fa313a4782c",
       [
        null,
        {}
       ]
      ],
      "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html": [
-      "370f3dc773fdc9bdf98dc77e5b439e92371b3796",
+      "ba8edadc188c7cc7fe8de79e95a06a824911e458",
       [
        null,
        {}
@@ -485632,29 +488530,99 @@
      ]
     },
     "about-blank.https.sub.html": [
-     "6af31dd021f902f5005becf7b39332d0139da887",
+     "edc98b363e46471b3e5db54b6b5a0b827dbb0a6d",
      [
       null,
       {}
      ]
     ],
     "getter-special-cases": {
-     "data-url.https.html": [
-      "6933f35930dc5f108b17588e990948f55f93183c",
+     "csp-sandbox-no.https.html": [
+      "16ecb45192950d29329c6bd54a6b561f281b07a2",
+      [
+       null,
+       {}
+      ]
+     ],
+     "csp-sandbox-yes.https.html": [
+      "b9a7359974d5651f955cb65c03862a0eeb79a35d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "data-to-javascript-no.https.html": [
+      "cb00ef782d0cf558ebcc28a6fa103b9826fb541d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "data-to-javascript-yes.https.html": [
+      "6856441deff1d0c707dbc8b1217dd6fb718eea36",
+      [
+       null,
+       {}
+      ]
+     ],
+     "data-url-no.https.html": [
+      "5b194eaef3552fd7c7f5ba64ab3f4db648f0d457",
+      [
+       null,
+       {}
+      ]
+     ],
+     "data-url-yes.https.html": [
+      "85821be32b53245bc1356321a8bc085716a710c2",
+      [
+       null,
+       {}
+      ]
+     ],
+     "javascript-url-no.https.html": [
+      "b75cae47cdbb6c49b33044729a141ed52462af7e",
+      [
+       null,
+       {}
+      ]
+     ],
+     "javascript-url-yes.https.html": [
+      "573b1a0b712bd6c93c3931642fbe3603cc721d54",
       [
        null,
        {}
       ]
      ],
      "removed-iframe.sub.https.html": [
-      "fd838cdbb55bfd9ec46db7b7f9625c08d4d60efb",
+      "d7ad4903ab9bfb2d07858f688238967f7817d90e",
       [
        null,
        {}
       ]
      ],
-     "sandboxed-iframe.sub.https.html": [
-      "fb91d4677648152c1834a59e9bdf9f80813e6127",
+     "sandboxed-iframe-no.https.html": [
+      "bc2276fede8ac74f4cb7fb9b119a8e306bc9160a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "sandboxed-iframe-yes.https.html": [
+      "5805d3421ebe2590585f0f7166d781eb979e6277",
+      [
+       null,
+       {}
+      ]
+     ],
+     "sandboxed-same-origin-iframe-no.https.html": [
+      "a1b44a1e5b34778aa7f8aa8fc64d5f0cbceced52",
+      [
+       null,
+       {}
+      ]
+     ],
+     "sandboxed-same-origin-iframe-yes.https.html": [
+      "b9339afae2e802178d55972af5033cf7050a2408",
       [
        null,
        {}
@@ -485670,56 +488638,56 @@
     ],
     "iframe-navigation": {
      "parent-no-1-no-same-2-yes-port.sub.https.html": [
-      "ff9ea4dca8c3ef27dbc863f7b3324a2882375f71",
+      "85ee2f677f31dd23814276c015c39ac8abb88bef",
       [
        null,
        {}
       ]
      ],
      "parent-no-1-no-same-2-yes-subdomain.sub.https.html": [
-      "f599cb986d93a32e4affa20909e7b8fc72262955",
+      "bb39de648acf177ef0ee6479a4b7a8655ee8b168",
       [
        null,
        {}
       ]
      ],
      "parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html": [
-      "8777b656e335e5d91cb73ab6602f9d297c2405e6",
+      "b52ca783f6f711fae40f9e01795d5072c9d36644",
       [
        null,
        {}
       ]
      ],
      "parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html": [
-      "22f35eb9149c49afda18579c2e3da9bbc055e4a8",
+      "67e99cee090ad9766b3734784dec96e39dda511a",
       [
        null,
        {}
       ]
      ],
      "parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html": [
-      "ac51e6ef80c96bbc522599ee465644bd7434fda8",
+      "1b7dd01947f69eb7311ef3d7235701fe229b6aa3",
       [
        null,
        {}
       ]
      ],
      "parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html": [
-      "425983423ba74639b368be90c1ed3771b1e787b4",
+      "783f5870a839b1b63f96e28a9c734e0538839547",
       [
        null,
        {}
       ]
      ],
      "parent-yes-1-no-same-2-no-port.sub.https.html": [
-      "2d9c9ac98d02c4f6ed6ceac4f7cd1faed7c222db",
+      "461fd0ddc4b88697fb49cd3a89166f88c0310636",
       [
        null,
        {}
       ]
      ],
      "parent-yes-1-no-same-2-no-subdomain.sub.https.html": [
-      "abf0da2b5d60a0466cc741557fa14c6a64a52de5",
+      "6832cd03858cab38e03993b676a52ca81c594c97",
       [
        null,
        {}
@@ -485727,14 +488695,79 @@
      ]
     },
     "insecure-http.sub.html": [
-     "583ca2f441b19fcaf63b7a3193090b96c46b77ed",
+     "18e0216e2627a2f81d9237be5e497aed3f22a482",
      [
       null,
       {}
      ]
     ],
+    "popups": {
+     "opener-no-openee-yes-port.sub.https.html": [
+      "270162530b100da850d4834c049553fc01d32a84",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-no-openee-yes-same.sub.https.html": [
+      "0c8d89b8e66bf21ac2aa693f5dbf2131d9f8b4d0",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-no-openee-yes-subdomain.sub.https.html": [
+      "d1aaabd9206239469b2e7871cf6a0ab30a48bcb1",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-yes-openee-no-port.sub.https.html": [
+      "96b839e167f92326d72afad1b62a36b36ee25b6a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-yes-openee-no-same.sub.https.html": [
+      "0dee5fae002277fdb3811524b37e8025a4118a3e",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-yes-openee-no-subdomain.sub.https.html": [
+      "cfec0fda1301d90bf71da00e1f93f02e71fb8119",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-yes-openee-yes-port.sub.https.html": [
+      "4ea37421df0ac11baa99d6fc435ca5be50af2b6b",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-yes-openee-yes-same.sub.https.html": [
+      "603f11d8de6cb78b96735a740330145787f5cf75",
+      [
+       null,
+       {}
+      ]
+     ],
+     "opener-yes-openee-yes-subdomain.sub.https.html": [
+      "b182d496a9278b17e26c7ee870aa9252f0a05b18",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "removing-iframes.sub.https.html": [
-     "3a6d91c447a97231257a226622f125426d174c72",
+     "cbe13af820798a1a88300cea92ea2bf843b77933",
      [
       null,
       {}
@@ -486170,7 +489203,7 @@
      ]
     ],
     "child-painting-first-image.html": [
-     "38cf499ccaf8a5da96424c17dba675cbd5eff6e8",
+     "3badae1849feaf5b2a0288ebe556af3ea1216586",
      [
       null,
       {}
@@ -486178,21 +489211,21 @@
     ],
     "fcp-only": {
      "fcp-background-size.html": [
-      "8cc83702c1fb8c411813ba23594c6ad39de09bd7",
+      "25fe986bdede921980b96c10f9d3d26a83558cbc",
       [
        null,
        {}
       ]
      ],
      "fcp-bg-image-set.html": [
-      "0cc52d0263e0239816ab075ae1ed90b2fd9a26c6",
+      "443cef630bd1b1ea77e477fdf06967cc075cce2d",
       [
        null,
        {}
       ]
      ],
      "fcp-bg-image-two-steps.html": [
-      "4dc9af9da84fdb0dea6d39cf8dd50611de87c704",
+      "89b161f8593041226be4d38d5a335abbfb3324f1",
       [
        null,
        {}
@@ -486212,6 +489245,13 @@
        {}
       ]
      ],
+     "fcp-iframe.html": [
+      "674bcd91214232891f27a6598ad52fb2b92f3c45",
+      [
+       null,
+       {}
+      ]
+     ],
      "fcp-invisible-3d-rotate-descendant.html": [
       "76d459d0f40fcaa46e9561e76c99b4d4a17f157b",
       [
@@ -486234,7 +489274,7 @@
       ]
      ],
      "fcp-invisible-scale.html": [
-      "5389e8a846bf6c2844dd61fe3a4e0cb9344b4ffe",
+      "4d3a060e85107bcfcdb2811f667992ff780c78f9",
       [
        null,
        {}
@@ -486255,7 +489295,7 @@
       ]
      ],
      "fcp-opacity.html": [
-      "83afdde195b73eb7a348255da05594b1a2bc45a1",
+      "3c6912c4e6eef50e0d9eb90d64314f9be6dd4f67",
       [
        null,
        {}
@@ -486269,7 +489309,7 @@
       ]
      ],
      "fcp-out-of-bounds.html": [
-      "3553772d4fc6b68c9769442129723a57e07aea16",
+      "91556e50e0a0532f6c37acc846851e27b50a5d6d",
       [
        null,
        {}
@@ -486283,7 +489323,7 @@
       ]
      ],
      "fcp-pseudo-element-image.html": [
-      "ba38edb68cbedf3157344cb9477c2e48fb1daea8",
+      "d67ae21cd964678544d8da831a3a0983843a6a38",
       [
        null,
        {}
@@ -486346,7 +489386,7 @@
       ]
      ],
      "fcp-whitespace.html": [
-      "6e1f425de80225931a517b6c839e7be23bf26f91",
+      "71c72b018a482872484121a0840f8071fcdfad01",
       [
        null,
        {}
@@ -486479,7 +489519,7 @@
      ]
     ],
     "sibling-painting-first-image.html": [
-     "266d5d7af3248d086bb4e903bd8edbb768ca29b2",
+     "096c49ac19ec6f04255430b87e8e3ab216a8416c",
      [
       null,
       {}
@@ -487096,7 +490136,7 @@
      ]
     ],
     "secure-payment-confirmation.https.html": [
-     "860876e2e9bb750a266b33472753444532fe9a6a",
+     "1cc12d49eba1369d57512a52de30eab4fa477da2",
      [
       null,
       {}
@@ -487127,7 +490167,7 @@
      ]
     ],
     "case-sensitivity.any.js": [
-     "588b59cc6a796b64aa4ad42137700430805a1d16",
+     "3a98505ae67f7df6f617d6b9fde4af367503278e",
      [
       "performance-timeline/case-sensitivity.any.html",
       {}
@@ -487956,7 +490996,7 @@
       ]
      ],
      "pointerevent_mouse-pointer-preventdefault.html": [
-      "a727325a5b1d0e7d4f02899a98cfc5d457e106a4",
+      "c4990ff5f9db0bee3ca2638b43f8bba89119555a",
       [
        null,
        {
@@ -488203,6 +491243,15 @@
       }
      ]
     ],
+    "pointerevent_mouse_pointercapture_inactivate_pointer.html": [
+     "24b65213ecc336f02831a74327fcfd93e25eb4c4",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_on_event_handlers.html": [
      "d8cfa7a0f4c482be606e4e98f9a7900a0340a477",
      [
@@ -488711,6 +491760,15 @@
       {}
      ]
     ],
+    "pointerevent_touch-adjustment_click_target.html": [
+     "46d5ac1793be0445bd2968c50ebf949e1ba2202f",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerlock": {
      "pointerevent_coordinates_when_locked.html": [
       "a79327252277d3b27e416e885b27ff6cb0b0bf5d",
@@ -488777,7 +491835,7 @@
       ]
      ],
      "pointerevent_pointermove_on_chorded_mouse_button_when_locked.html": [
-      "eaa5325699d0d5193054a173b7a84dfbd4091b83",
+      "92fcc93699b24001ec939a2ed3ac2724ea3cf398",
       [
        null,
        {
@@ -489059,7 +492117,7 @@
      ]
     ],
     "portals-host-exposure.sub.html": [
-     "93ee8ecdc0968b71aa19927cfce39191b8d33e16",
+     "fd3ac18f69d444f679d4b45a26ebd3d21521dc70",
      [
       null,
       {}
@@ -489080,7 +492138,7 @@
      ]
     ],
     "portals-host-post-message.sub.html": [
-     "e547642c9f27e91a1bd911214fba7750f136ed8d",
+     "aa4893cb904d29087ea5413c90eddf7dc317a216",
      [
       null,
       {
@@ -489103,7 +492161,7 @@
      ]
     ],
     "portals-post-message.sub.html": [
-     "2f6b25d97dab30d1b8ae86a6ab27526393dad3eb",
+     "19803f686969678f72030d6a6ddce4b0d361b275",
      [
       null,
       {
@@ -489176,8 +492234,15 @@
     }
    },
    "preload": {
+    "avoid-delaying-onload-link-preload-style.html": [
+     "299713834094fb9661c2ea46aa7022c1af2cdc22",
+     [
+      null,
+      {}
+     ]
+    ],
     "avoid-delaying-onload-link-preload.html": [
-     "a1b19c81c6783477f8914bf94d8e58d8644e06f3",
+     "6b9b577b89c3b98583a49d4235da362f741e9732",
      [
       null,
       {}
@@ -489766,6 +492831,40 @@
      ]
     }
    },
+   "raw-sockets": {
+    "open-consume-activation.https.html": [
+     "f6dda4488bafef83fddb4af0e9958ae8a5892153",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
+    "open-securecontext.http.html": [
+     "371f13781a4e2bdea9d9fa2545a13b8e4add9ba8",
+     [
+      null,
+      {}
+     ]
+    ],
+    "open-without-user-gesture.https.html": [
+     "ed9a9e0d2c63428d39d7c2ebbde8fd1d58d9b02b",
+     [
+      null,
+      {}
+     ]
+    ],
+    "remotePort-required.https.html": [
+     "6d738da845ae09b265d1ce4ad93d3ec6528b46b3",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ]
+   },
    "referrer-policy": {
     "4K": {
      "gen": {
@@ -500632,7 +503731,7 @@
      ]
     ],
     "resource_nested_dedicated_worker.worker.js": [
-     "fc793075bbade1b0891ea8ecf50137051d84b820",
+     "2c9f5f95428aca5ce9d18714223fab6f78f360c0",
      [
       "resource-timing/resource_nested_dedicated_worker.worker.html",
       {}
@@ -500768,6 +503867,47 @@
      ]
     ]
    },
+   "sanitizer-api": {
+    "idlharness.tentative.window.js": [
+     "384317b8e55bd318464c68e20ca737bfb5b2c966",
+     [
+      "sanitizer-api/idlharness.tentative.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "sanitizer-config.tentative.html": [
+     "c780bbe21b74fc96c491b29181a05decb3e5fea5",
+     [
+      null,
+      {}
+     ]
+    ],
+    "sanitizer-sanitize.tentative.html": [
+     "219eff418918484a2b8f42062ea7bf8cb60dbad8",
+     [
+      null,
+      {}
+     ]
+    ],
+    "sanitizer-sanitizeToString.tentative.html": [
+     "98bb4a4601863d2ee50ef18333f88cfbe43e40fe",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "savedata": {
     "idlharness.any.js": [
      "aad362346ca5fa9999a05a3456756d150bf0e354",
@@ -501056,6 +504196,15 @@
       }
      ]
     ],
+    "wakelock-released.https.html": [
+     "13520578527d819996eb40d221395b895511a058",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "wakelock-request-denied.https.html": [
      "b222ef342a6566a9d424044713b1acf2666679eb",
      [
@@ -501145,7 +504294,7 @@
      ]
     ],
     "getScreens.values.https.html": [
-     "881396adbc3befefb39b55020d8f798379bfa648",
+     "93b27b465561c1d97703f87804d4ba91389ef753",
      [
       null,
       {}
@@ -501174,7 +504323,7 @@
      ]
     ],
     "isMultiScreen.values.https.html": [
-     "5146803ea9c20c5f8ae43cf385895a95fc361747",
+     "2a79db4e10ec6e9664807a85df56e9327bdb73eb",
      [
       null,
       {}
@@ -501219,20 +504368,27 @@
      ]
     ],
     "constructor.html": [
-     "7cb7013c00685aa07f2a5a4acee22365a5d08293",
+     "eae6278f71b089f650ce1ee6934746f2d6b8240d",
      [
       null,
       {}
      ]
     ],
     "constructor.tentative.html": [
-     "799b1460dc1baa15eb26b52ff927aa903ece5b24",
+     "4510916a132f4f5e6c1c1d1a042773248ea89c6d",
      [
       null,
       {}
      ]
     ],
     "css": {
+     "animation-shorthand.html": [
+      "7b30ec611f50c8b9bee8b28187cd9d39612b6f8d",
+      [
+       null,
+       {}
+      ]
+     ],
      "animation-timeline-computed.html": [
       "02836d714b59081b3a14c2bd124d2ac254d23d58",
       [
@@ -501241,7 +504397,14 @@
       ]
      ],
      "animation-timeline-in-keyframe.html": [
-      "bdf40e0747ff96d58cabdfc820373434cd5e2fd8",
+      "75483331390d9fb6571307c3158cc37adcd893ee",
+      [
+       null,
+       {}
+      ]
+     ],
+     "animation-timeline-none.html": [
+      "d5d585366c9e3c451f9d19f0c573798d1413644e",
       [
        null,
        {}
@@ -501268,6 +504431,13 @@
        {}
       ]
      ],
+     "at-scroll-timeline-element-offsets.html": [
+      "884f2ab5ed71f199603ca4fc1f0063528e6d19e8",
+      [
+       null,
+       {}
+      ]
+     ],
      "at-scroll-timeline-inactive-phase.html": [
       "a8db8e63238bc3f547094733e302a659646eefde",
       [
@@ -501276,7 +504446,7 @@
       ]
      ],
      "at-scroll-timeline-orientation.html": [
-      "2c76f7a111769e09dd9593219281393fffa84e38",
+      "9bc49d284b85d5d18c2548a5b3dc7b82375ae507",
       [
        null,
        {}
@@ -501290,28 +504460,28 @@
       ]
      ],
      "at-scroll-timeline-source.html": [
-      "f2c50a1cd3826e45f7d9609c01085619da435140",
+      "ed24d1865790a0000dcb9c5b208ac8be43f4144b",
       [
        null,
        {}
       ]
      ],
      "at-scroll-timeline-start-end.html": [
-      "fbe53d0fc0cf8716c0582c422e5b0560cd242b33",
+      "c53de5d865f37c49340e3ca85d3dc31a8ab6e48d",
       [
        null,
        {}
       ]
      ],
      "at-scroll-timeline-time-range.html": [
-      "407e17f0748714951e97d1bea0e5e709040c5955",
+      "2a57ed456a25281474d797ca090a842861d8687d",
       [
        null,
        {}
       ]
      ],
      "scroll-timeline-cssom.tentative.html": [
-      "09ec90a04493c69d93c07a38e116150923582ffc",
+      "d9e4cc08cbe1649ed8c60697f28fd43b86053584",
       [
        null,
        {}
@@ -501333,14 +504503,14 @@
      ]
     ],
     "current-time-writing-modes.html": [
-     "5a53d43f037f9bda10f25e906af98518d554e084",
+     "c5c1fe155a89b534d4ba53992a4a10969e17bd7e",
      [
       null,
       {}
      ]
     ],
     "current-time.html": [
-     "ad489d02811b96b2fa8c9d189712fa53c1cada50",
+     "cbe2d8d6005b0a0e361f858cdfc6b894dbce9011",
      [
       null,
       {}
@@ -501414,7 +504584,7 @@
      ]
     ],
     "scroll-animation-effect-phases.tentative.html": [
-     "b8e678e9218395f43f2690a67fb1d887ce73dacc",
+     "47e2717ecdcc635feebb7a60c6e542af53dac4ac",
      [
       null,
       {
@@ -501444,7 +504614,7 @@
      ]
     ],
     "scroll-timeline-phases.tentative.html": [
-     "c58ba1dc066d9acd684502922ff7805aea5ab0b5",
+     "6e5c752d59905ae49b7087cf356dee76b12c0f9e",
      [
       null,
       {}
@@ -501480,6 +504650,13 @@
       {}
      ]
     ],
+    "setting-timeline.tentative.html": [
+     "3fd0c0cd6769674439eb4500699ea7b54dbf3846",
+     [
+      null,
+      {}
+     ]
+    ],
     "update-playback-rate.html": [
      "82cf69999f6860604aae540ffda91f4d809498ed",
      [
@@ -501505,8 +504682,35 @@
       }
      ]
     ],
+    "idlharness.window.js": [
+     "c39216b581124f599cae99a4871c7a29c03bffb0",
+     [
+      "scroll-to-text-fragment/idlharness.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/WebIDLParser.js"
+        ],
+        [
+         "script",
+         "/resources/idlharness.js"
+        ]
+       ]
+      }
+     ]
+    ],
+    "redirects.html": [
+     "5ad910affe55f6dd5ff63cdd3e019cf969fc6653",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "scroll-to-text-fragment-api.html": [
-     "8b1dea6f331bf41b4759cadf6859f016848566fa",
+     "d644b6b64fb530fef800c5abaaf91835eda9aa83",
      [
       null,
       {
@@ -501586,105 +504790,6 @@
       {}
      ]
     ],
-    "idlharness.any.js": [
-     "396dfff1fdff9d65a4f8a5a3308312b5ef5a349d",
-     [
-      "secure-contexts/idlharness.any.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "secure-contexts/idlharness.any.serviceworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "secure-contexts/idlharness.any.sharedworker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ],
-     [
-      "secure-contexts/idlharness.any.worker.html",
-      {
-       "script_metadata": [
-        [
-         "global",
-         "window,worker"
-        ],
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ],
-        [
-         "timeout",
-         "long"
-        ]
-       ],
-       "timeout": "long"
-      }
-     ]
-    ],
     "shared-worker-insecure-first.https.html": [
      "00db9517d01ea6e4d8d680211e5a9f0488c51283",
      [
@@ -501907,6 +505012,22 @@
       {}
      ]
     ],
+    "contenteditable": {
+     "collapse.html": [
+      "6081d05516729dbef483f6bf2b966b117416fa8d",
+      [
+       null,
+       {}
+      ]
+     ],
+     "modify.tentative.html": [
+      "aaedc72644bd6420bc723f287b78c4fd2bd9a1a9",
+      [
+       null,
+       {}
+      ]
+     ]
+    },
     "deleteFromDocument.html": [
      "b7e036009f8cb24a4a92ea5bd6480a4fd6eb5472",
      [
@@ -502298,7 +505419,7 @@
        ]
       ],
       "cache-add.https.html": [
-       "8dfb786cf356777cd9de286ccd3534c95ea0116c",
+       "b5a64c6c369b5028b4aba1396738dc892bc62d3b",
        [
         null,
         {
@@ -502343,7 +505464,7 @@
        ]
       ],
       "cache-put.https.html": [
-       "1ee14bdd124eefb14f07b148c5390c800ad20890",
+       "9641c3470518636f1d2afbbc692f721f20790739",
        [
         null,
         {
@@ -503285,7 +506406,7 @@
       ]
      ],
      "fetch-request-resources.https.html": [
-      "fe227d9ce2f4943ec8a2aa936882f7b46daca28f",
+      "50864ca78955ea2d52b8e6f71abe2dd6dfef431a",
       [
        null,
        {}
@@ -505289,7 +508410,7 @@
      ]
     ],
     "detection-on-worker.https.worker.js": [
-     "94b8e37d7272ea8f882d856d49fb9be334f1ffe5",
+     "3981c6fdc8e12839d3aa30206fa16d8af1faf513",
      [
       "shape-detection/detection-on-worker.https.worker.html",
       {}
@@ -506224,6 +509345,13 @@
       }
      ]
     ],
+    "quotachange-in-detached-iframe.tentative.https.html": [
+     "123af50e3ce6a3f98756d0377a166dbecfa146fe",
+     [
+      null,
+      {}
+     ]
+    ],
     "storagemanager-estimate.https.any.js": [
      "d1d2e21924cd016165b02436dea994f44c193cd9",
      [
@@ -509082,6 +512210,31 @@
       ]
      ]
     },
+    "transferable": {
+     "deserialize-error.window.js": [
+      "64cf2bbfb1293e90a67df02cebddeee51ae0ef78",
+      [
+       "streams/transferable/deserialize-error.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/common/get-host-info.sub.js"
+         ],
+         [
+          "script",
+          "resources/create-wasm-module.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
     "transform-streams": {
      "backpressure.any.js": [
       "64c9d0930ed2f26af775fa0cb4bc58edac7fface",
@@ -518422,7 +521575,7 @@
       ]
      },
      "idlharness.any.js": [
-      "a2de9de859e4c5fdb581188bb9d9e88f23ec06d7",
+      "98713d4bf6e43af90c705e55c59be277463b9e0b",
       [
        "wasm/jsapi/idlharness.any.html",
        {
@@ -518893,8 +522046,31 @@
         }
        ]
       ],
+      "constructor-types.tentative.any.js": [
+       "764aac78670c5d0711345434060801b76eeb2291",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/memory/assertions.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "constructor.any.js": [
-       "6524c8acc49016e10746d686c860eeba6fd3c16d",
+       "30cc8ef9885fe0507bcea15aa88ac57a2bd4c124",
        [
         null,
         {
@@ -519369,8 +522545,31 @@
       ]
      ],
      "table": {
+      "constructor-types.tentative.any.js": [
+       "09ab18a2d8cec7443eb58eee81f0ef7b86aacb41",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/table/assertions.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "constructor.any.js": [
-       "e9e77a132b76a479a2895c18c69b402be71fe3e7",
+       "794976e8266f9ed0ebda0fc49ec9a92ca7c890c4",
        [
         null,
         {
@@ -519383,6 +522582,10 @@
           [
            "script",
            "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/table/assertions.js"
           ]
          ]
         }
@@ -519398,6 +522601,10 @@
           [
            "script",
            "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/table/assertions.js"
           ]
          ]
         }
@@ -519413,6 +522620,10 @@
           [
            "script",
            "/wasm/jsapi/assertions.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/table/assertions.js"
           ]
          ]
         }
@@ -521087,7 +524298,7 @@
        ]
       ],
       "setting-the-timeline-of-an-animation.html": [
-       "7e98ef4260f778c4257203f92db39a6bdaa92871",
+       "d4f802152c57b0f0c43a649472c48d19541f4d97",
        [
         null,
         {}
@@ -521163,7 +524374,7 @@
       ]
      ],
      "subresource-loading-from-web-bundle.tentative.html": [
-      "27e164afe8be36dfbbaed11f7d7faaf88431d131",
+      "1e0e78a320403e67d447a6df99ef819bd85c0106",
       [
        null,
        {}
@@ -522293,7 +525504,7 @@
      ]
     ],
     "NDEFWriter_write.https.html": [
-     "e2bbd57bbe97d380f33e76508081d0d18891980c",
+     "57fd300a34f9b8fddf0489dec6048b4a55273f54",
      [
       null,
       {}
@@ -522382,7 +525593,7 @@
      ]
     ],
     "disabled-by-feature-policy.https.sub.html": [
-     "9c1893232997ac27d493d54c74d0bfd0b8b8888b",
+     "6fc49fa4d97a5fe27173fc89d20e0fc32b18d78d",
      [
       null,
       {
@@ -522390,6 +525601,13 @@
       }
      ]
     ],
+    "feature-policy-listed.html": [
+     "127498dde121648453050bd8f5562fddda4cf831",
+     [
+      null,
+      {}
+     ]
+    ],
     "idlharness.https.window.js": [
      "fbe59864af99c0a55b83e942f0e40f4d45de72a6",
      [
@@ -522414,7 +525632,7 @@
      ]
     ],
     "share-consume-activation.https.html": [
-     "4b4ecd560c6746dd4d1902ffa36388fbf92a9796",
+     "301469f83d8a6f27aa2ef0b87eb0e6fa583ecf2a",
      [
       null,
       {
@@ -522423,7 +525641,7 @@
      ]
     ],
     "share-empty.https.html": [
-     "c8fbb8ad451fdc6eb8779a2788ca1d41ed61aaab",
+     "23c2ddbf7782f6d87935ae15db87a50a14043d05",
      [
       null,
       {
@@ -522432,7 +525650,7 @@
      ]
     ],
     "share-securecontext.http.html": [
-     "8139c411e128f6fc556e6f1d63682e066cb39992",
+     "6344330c6b47b32e3872f3168c0edb604aef5499",
      [
       null,
       {}
@@ -522448,7 +525666,7 @@
      ]
     ],
     "share-url-invalid.https.html": [
-     "5eae8e89426b4889d6f987a25db24a840d583f71",
+     "d7ffd3b11ce3a60beb8c3466d8156f6ca55a4204",
      [
       null,
       {
@@ -523301,6 +526519,13 @@
         {}
        ]
       ],
+      "extended-audioworkletnode-with-parameters.https.html": [
+       "75f4aa4020d303c91209d1de4f6efb127b5f3eb0",
+       [
+        null,
+        {}
+       ]
+      ],
       "process-getter.https.html": [
        "a4c59123a104600c148f620bb32c78f112fdd12a",
        [
@@ -523635,6 +526860,13 @@
         {}
        ]
       ],
+      "delay-test.html": [
+       "6277c253ec0daffea06fa924d11e4e6f8d5b03f1",
+       [
+        null,
+        {}
+       ]
+      ],
       "delaynode-channel-count-1.html": [
        "dd964ef9e36b1fb46f58c570d8337917541d80d1",
        [
@@ -523877,6 +527109,13 @@
         {}
        ]
       ],
+      "detune-overflow.html": [
+       "28c28bc1db5fe0680c931a7dafecc9c93b82fb47",
+       [
+        null,
+        {}
+       ]
+      ],
       "osc-basic-waveform.html": [
        "b34c96855fdbb26428c64ed879d41ec787fb8d85",
        [
@@ -524315,8 +527554,36 @@
     ]
    },
    "webcodecs": {
+    "audio-decoder.html": [
+     "e6bc81d35cba86a63d68cb0635e10e3c3d627cfe",
+     [
+      null,
+      {}
+     ]
+    ],
+    "video-decoder.html": [
+     "33c478d0090775bee319c6f30710bfdedad7bc86",
+     [
+      null,
+      {}
+     ]
+    ],
     "video-encoder.html": [
-     "ce03f058f78ec551afc8024203f633e64cb1a29f",
+     "20b01a93299b0730a4f80130e6a8e24c95b72d17",
+     [
+      null,
+      {}
+     ]
+    ],
+    "video-frame-serialization.html": [
+     "8c111488e7c959a8844583ae2117f9abb8ffd8a1",
+     [
+      null,
+      {}
+     ]
+    ],
+    "video-frame.html": [
+     "de39603b1530c980e754e1b311c060159251d312",
      [
       null,
       {}
@@ -525505,7 +528772,7 @@
      ]
     ],
     "RTCIceCandidate-constructor.html": [
-     "6c208e887f473a031e0e9ee07658b53bfbe5935a",
+     "66d696207962f8669dd6d3c28800241e80f4ab4a",
      [
       null,
       {}
@@ -525585,6 +528852,13 @@
       {}
      ]
     ],
+    "RTCPeerConnection-candidate-in-sdp.https.html": [
+     "6c97afe94ae59743896c9d26bb850cc754f57e5b",
+     [
+      null,
+      {}
+     ]
+    ],
     "RTCPeerConnection-connectionState.https.html": [
      "5db8272df307260f9db0c4333c23c7ad4c4432b6",
      [
@@ -525622,6 +528896,13 @@
       {}
      ]
     ],
+    "RTCPeerConnection-description-attributes-timing.https.html": [
+     "2d2565c3e1e0734a42231522d77129506491d2c1",
+     [
+      null,
+      {}
+     ]
+    ],
     "RTCPeerConnection-explicit-rollback-iceGatheringState.html": [
      "9c1fe014bd9ee18bb6a9ab65ea7aa3eebbce1200",
      [
@@ -525676,14 +528957,14 @@
      ]
     ],
     "RTCPeerConnection-iceGatheringState.html": [
-     "88acf348eb5eaf0e803a88381d1b5463647b7a9e",
+     "e7d8f220e66818698686ca8e8ee4bc66156c1c70",
      [
       null,
       {}
      ]
     ],
     "RTCPeerConnection-mandatory-getStats.https.html": [
-     "5b0d59153dca428518ee510e01e1d4ffe87abf00",
+     "50158d4cea0cde3ae5f583140859de6da79ba0bd",
      [
       null,
       {
@@ -525713,7 +528994,7 @@
      ]
     ],
     "RTCPeerConnection-onsignalingstatechanged.https.html": [
-     "0c8405770b616d1d0f3be226a815780cc1ad0413",
+     "fa096c1fb60d9f257f0505826c28e9cecd5c93c6",
      [
       null,
       {}
@@ -525733,8 +529014,26 @@
       {}
      ]
     ],
+    "RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html": [
+     "cf8bdf22e2de53a0d28263150cd83f5d954b6d14",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
+    "RTCPeerConnection-perfect-negotiation-stress-glare.https.html": [
+     "6134eb2006366cac61c7190b8dc11144d0681332",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "RTCPeerConnection-perfect-negotiation.https.html": [
-     "ad2725c33ca66b303959f32d107ae516bade4a61",
+     "d01b11616263661e721d44451215931ea8e4f3c1",
      [
       null,
       {
@@ -525905,7 +529204,7 @@
      ]
     ],
     "RTCPeerConnection-videoDetectorTest.html": [
-     "71fffdc68603465b22b32da738ab5fedab378f41",
+     "6786bd49ede68eaa075fdb2d127d4074e5e90035",
      [
       null,
       {
@@ -526053,7 +529352,7 @@
      ]
     ],
     "RTCRtpTransceiver-setCodecPreferences.html": [
-     "f79c43b2919545c15730d109fbf03abbc9afb414",
+     "bed359512a4f688d56758f9ab0b3a437fd1cf8a8",
      [
       null,
       {}
@@ -526067,7 +529366,7 @@
      ]
     ],
     "RTCRtpTransceiver.https.html": [
-     "487774982298376b7ce27a2cbfaea7ad3c716e28",
+     "412736b1d195d7977b7be974ef4eddd828da3e12",
      [
       null,
       {
@@ -526454,14 +529753,35 @@
    },
    "webrtc-insertable-streams": {
     "RTCEncodedAudioFrame-serviceworker-failure.https.html": [
-     "79708e706de06cd94bf2c63f6dd4bca543701481",
+     "ea44485fe6f99b878d1bcd36343f5d46c382dae0",
      [
       null,
       {}
      ]
     ],
     "RTCEncodedVideoFrame-serviceworker-failure.https.html": [
-     "54b3a54b364ed8725c256c6d4b4e5856024099b3",
+     "1d92302746b3ab4768441f157e20153077302120",
+     [
+      null,
+      {}
+     ]
+    ],
+    "RTCPeerConnection-insertable-streams-audio.https.html": [
+     "aecf671854c3e54f27e9796c29d41bcd78626dab",
+     [
+      null,
+      {}
+     ]
+    ],
+    "RTCPeerConnection-insertable-streams-simulcast.https.html": [
+     "a34f4da5a94704ae02b5329cca87a7773af81ae3",
+     [
+      null,
+      {}
+     ]
+    ],
+    "RTCPeerConnection-insertable-streams.https.html": [
+     "de225d508992bd686ab3cf3165072f6901aa75ca",
      [
       null,
       {}
@@ -530690,24 +534010,6 @@
       }
      ]
     ],
-    "idlharness.window.js": [
-     "177eb607f7b7774a20e0cde57032720b8efde520",
-     [
-      "webstorage/idlharness.window.html",
-      {
-       "script_metadata": [
-        [
-         "script",
-         "/resources/WebIDLParser.js"
-        ],
-        [
-         "script",
-         "/resources/idlharness.js"
-        ]
-       ]
-      }
-     ]
-    ],
     "missing_arguments.html": [
      "1c8a1a4481581820da2b22210c4394bd6b6b97ac",
      [
@@ -530716,7 +534018,7 @@
      ]
     ],
     "set.window.js": [
-     "228ce60296697a21520b8c635bd352ed1fbefb2c",
+     "1c20907939ad0b7b42987f9b2c573e4a17c10707",
      [
       "webstorage/set.window.html",
       {}
@@ -532363,6 +535665,26 @@
       {}
      ]
     ],
+    "hand-input": {
+     "idlharness.https.window.js": [
+      "184ec6b3060a45a2ebcd9f0268f5bbdf7353a250",
+      [
+       "webxr/hand-input/idlharness.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "/resources/WebIDLParser.js"
+         ],
+         [
+          "script",
+          "/resources/idlharness.js"
+         ]
+        ]
+       }
+      ]
+     ]
+    },
     "hit-test": {
      "ar_hittest_source_cancel.https.html": [
       "66f22b1f0c4bede2543f10f8e2cbd6ff78d981d3",
@@ -533765,7 +537087,7 @@
      ]
     ],
     "Worker_script_mimetype.htm": [
-     "55d81d5d1c9b6105f1815dc09390467b47f0965d",
+     "29cc5d3345f66837e9091f870df5f20a9ab4405c",
      [
       null,
       {}
@@ -534468,7 +537790,7 @@
       },
       "onerror": {
        "exception-in-onerror.html": [
-        "d8aa02a01b8c841b2db575a1b7a77388d66d3dda",
+        "5f3999db66a78da50403149bea91d7c283e11bad",
         [
          null,
          {}
@@ -534481,6 +537803,34 @@
          {}
         ]
        ],
+       "message-classic-DOMException.html": [
+        "df8c85147509b4d104fff002ac16e155879388ea",
+        [
+         null,
+         {}
+        ]
+       ],
+       "message-classic-Error.html": [
+        "e026b6ebf09f9febf3bde63c97082fe7177c02c5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "message-module-DOMException.html": [
+        "8ed873bc3227e8b80085f0cffb0148d07191964b",
+        [
+         null,
+         {}
+        ]
+       ],
+       "message-module-Error.html": [
+        "046ff969d6bd7d928c09f26351eaf8aea0f86a4d",
+        [
+         null,
+         {}
+        ]
+       ],
        "not-handled.html": [
         "11d03d728b158f2cf46af96f8cc1b2cfa137f5ab",
         [
@@ -535805,36 +539155,43 @@
     ]
    },
    "x-frame-options": {
-    "deny.sub.html": [
-     "dd8afe8079a0096295881c15db95a97d5f25c7b6",
+    "deny.html": [
+     "90f65d3f439ff3c29bb7ef2703db84fad7b06365",
      [
       null,
       {}
      ]
     ],
-    "invalid.sub.html": [
-     "4604033d01fc2fa345e8f1f1cfdbb9397b89a996",
+    "get-decode-split.html": [
+     "9f5101d610eb28a3c48d7a8728b405984fe8a290",
      [
       null,
       {}
      ]
     ],
-    "multiple.sub.html": [
-     "717e9fd25c51ee80f3adf029740d475790b3875e",
+    "invalid.html": [
+     "26b2905e4d44c2534af70930e2ea24876ed0f556",
      [
       null,
       {}
      ]
     ],
-    "redirect.sub.html": [
-     "0bc708b358cb309718ba5c4350f8150b87c4c8f0",
+    "multiple.html": [
+     "cc8d6e3fdaa27287cd3287e8bb937e1420606a85",
+     [
+      null,
+      {}
+     ]
+    ],
+    "redirect.html": [
+     "65fd0d5dd1434df55a6ed0db62cdbf2abae9130b",
      [
       null,
       {}
      ]
     ],
     "sameorigin.sub.html": [
-     "ede5446825995fce987d136c34f31a01ee87179c",
+     "45f9b01bf156a4f773097ac76727f92a1244c141",
      [
       null,
       {}
@@ -562279,7 +565636,7 @@
        ]
       ],
       "execute.py": [
-       "1dde379c8a8e0b362c8a242333b67dff1ebc3b91",
+       "32bf6f59d4fe42a75112f589c53162e98cbad9d4",
        [
         null,
         {}
@@ -562462,7 +565819,14 @@
      },
      "get_current_url": {
       "get.py": [
-       "c22e3d410c350248f5eb109e2ab332747e64a453",
+       "378ba27f2b213ea45793591a68ffe1003cc461f5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "iframe.py": [
+       "944e61b583fd305eb9069082a39c586761cdd39c",
        [
         null,
         {}
@@ -562633,7 +565997,14 @@
      },
      "get_title": {
       "get.py": [
-       "f0e58acbe9988e5e818b2f25ca958b69d3ca9887",
+       "7bb83c3f9cdb94be5189e9230e1f22a3e12b63b6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "iframe.py": [
+       "5991bf3590691f69cacba4e45fd23a3595d1fb99",
        [
         null,
         {}
@@ -562906,14 +566277,14 @@
        ]
       ],
       "new_tab.py": [
-       "0bf94496572183709743a5f0566931f1871c0ba2",
+       "9300b04c45fa4d4149afebea3a6d4ea30fd18478",
        [
         null,
         {}
        ]
       ],
       "new_window.py": [
-       "8b12248a5524f95aefb9ea6e6ae03c856fbfc751",
+       "b34854cc2f3f0e6643956827c48b7548cb3b3212",
        [
         null,
         {}
@@ -562975,7 +566346,7 @@
        ]
       ],
       "pointer.py": [
-       "d021eee7c9404cf09194a41632b6093c72ce961d",
+       "ca7d7b1be4811b56bc009ebd089172901db50852",
        [
         null,
         {
@@ -563019,7 +566390,7 @@
        ]
       ],
       "pointer_tripleclick.py": [
-       "3dd64ca456fc9090c362905b87391a567835bd54",
+       "81d51be1a7e6cfeba63528f4bea58343c9f7cc48",
        [
         null,
         {}
@@ -563062,14 +566433,14 @@
      },
      "print": {
       "printcmd.py": [
-       "8f3d99af8088ded2db2026b132d7c09ebd654874",
+       "51b9fac859264abce4c4fcca02656415aa941087",
        [
         null,
         {}
        ]
       ],
       "user_prompts.py": [
-       "f416f9c28dd2fba012efbff6f51caf3aacd13fdd",
+       "f510300cb7964a1d01e0c327c14c08b27e751b97",
        [
         null,
         {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
deleted file mode 100644
index baa9f1a7541..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-005.html]
-  [Miss clipped float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini
new file mode 100644
index 00000000000..17392520cdd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini
@@ -0,0 +1,2 @@
+[border-width-small-values-001-a.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini
new file mode 100644
index 00000000000..4fb4cdce41d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini
@@ -0,0 +1,2 @@
+[border-width-small-values-001-b.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/canvas-dynamic-change-001.html.ini b/tests/wpt/metadata/css/css-flexbox/canvas-dynamic-change-001.html.ini
new file mode 100644
index 00000000000..db640de4655
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/canvas-dynamic-change-001.html.ini
@@ -0,0 +1,4 @@
+[canvas-dynamic-change-001.html]
+  [.flexbox 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini b/tests/wpt/metadata/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
new file mode 100644
index 00000000000..3fb853b53f8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flex-aspect-ratio-img-row-006.html.ini
@@ -0,0 +1,2 @@
+[flex-aspect-ratio-img-row-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/table-with-percent-intrinsic-width.html.ini b/tests/wpt/metadata/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
new file mode 100644
index 00000000000..3a555b0fc4a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/table-with-percent-intrinsic-width.html.ini
@@ -0,0 +1,7 @@
+[table-with-percent-intrinsic-width.html]
+  [table 2]
+    expected: FAIL
+
+  [table 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-position.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-position.html.ini
new file mode 100644
index 00000000000..d99383b3d84
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-position.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-background-position.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/animations/tab-size-interpolation.html.ini b/tests/wpt/metadata/css/css-text/animations/tab-size-interpolation.html.ini
new file mode 100644
index 00000000000..f0166fb6c37
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/animations/tab-size-interpolation.html.ini
@@ -0,0 +1,589 @@
+[tab-size-interpolation.html]
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.3) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (-0.3) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (-0.3) should be [1\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (-0.3) should be [1\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (-0.3) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (1.5) should be [14.5px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (0) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (-0.3) should be [7.4\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [inherit\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0) should be [1\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (0) should be [1px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [0\] to [10\] at (0.3) should be [3\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [1\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (1.5) should be [15\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (1.5) should be [11\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0.3) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0) should be [10px\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (-0.3) should be [2.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (0.6) should be [6.4px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [0\] to [10\] at (-0.3) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (0.6) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [unset\] to [10\] at (1.5) should be [5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (0.6) should be [6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [1\] to [10px\] at (1.5) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [initial\] to [10\] at (0) should be [8\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [unset\] to [10\] at (-0.3) should be [23\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [unset\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [initial\] to [10\] at (0.3) should be [8.6\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (0.3) should be [3.7px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [0\] to [10\] at (0) should be [0\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [inherit\] to [10\] at (0.3) should be [17\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [4\] to [10\] at (0.6) should be [7.6\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (0) should be [20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (0.3) should be [6.5\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1px\] to [10px\] at (1) should be [10px\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [4\] to [10\] at (0.3) should be [5.8\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from neutral to [10\] at (-0.3) should be [3.5\]]
+    expected: FAIL
+
+  [CSS Transitions with transition: all: property <tab-size> from [4\] to [10\] at (1.5) should be [13\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [initial\] to [10\] at (0.6) should be [9.2\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from [0\] to [10\] at (1) should be [10\]]
+    expected: FAIL
+
+  [CSS Animations: property <tab-size> from [inherit\] to [10\] at (0.6) should be [14\]]
+    expected: FAIL
+
+  [Web Animations: property <tab-size> from neutral to [10\] at (0.6) should be [8\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-001.html.ini b/tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-001.html.ini
new file mode 100644
index 00000000000..1d1532d3f05
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-001.html.ini
@@ -0,0 +1,2 @@
+[tab-size-inline-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-002.html.ini b/tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-002.html.ini
new file mode 100644
index 00000000000..2c86079710a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/tab-size/tab-size-inline-002.html.ini
@@ -0,0 +1,2 @@
+[tab-size-inline-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/tab-size/tab-size-integer-004.html.ini b/tests/wpt/metadata/css/css-text/tab-size/tab-size-integer-004.html.ini
new file mode 100644
index 00000000000..6fa97c35fcd
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/tab-size/tab-size-integer-004.html.ini
@@ -0,0 +1,2 @@
+[tab-size-integer-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-002.html.ini b/tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-002.html.ini
new file mode 100644
index 00000000000..f66d7ce5370
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/eol-spaces-bidi-002.html.ini
@@ -0,0 +1,2 @@
+[eol-spaces-bidi-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-001.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-001.html.ini
new file mode 100644
index 00000000000..dd10c6e6aa9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-001.html.ini
@@ -0,0 +1,2 @@
+[trailing-ogham-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-002.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-002.html.ini
new file mode 100644
index 00000000000..571770b0949
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-002.html.ini
@@ -0,0 +1,2 @@
+[trailing-ogham-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-003.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-003.html.ini
new file mode 100644
index 00000000000..3a948541d64
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ogham-003.html.ini
@@ -0,0 +1,2 @@
+[trailing-ogham-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-ui/appearance-button-002.tentative.html.ini b/tests/wpt/metadata/css/css-ui/appearance-button-002.tentative.html.ini
deleted file mode 100644
index c166ea99deb..00000000000
--- a/tests/wpt/metadata/css/css-ui/appearance-button-002.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[appearance-button-002.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-ui/webkit-appearance-button-002.tentative.html.ini b/tests/wpt/metadata/css/css-ui/webkit-appearance-button-002.tentative.html.ini
deleted file mode 100644
index f76be95ab6e..00000000000
--- a/tests/wpt/metadata/css/css-ui/webkit-appearance-button-002.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[webkit-appearance-button-002.tentative.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index 171592fc08f..6ef8bb1049f 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -2,3 +2,6 @@
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
+  [elementsFromPoint on inner documents]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/css/cssom/CSSCounterStyleRule.html.ini b/tests/wpt/metadata/css/cssom/CSSCounterStyleRule.html.ini
new file mode 100644
index 00000000000..d631e397542
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/CSSCounterStyleRule.html.ini
@@ -0,0 +1,4 @@
+[CSSCounterStyleRule.html]
+  [CSSCounterStyleRule.cssText doesn't serialize with newlines]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini b/tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini
new file mode 100644
index 00000000000..ef2b41ef6d4
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/CSSFontFaceRule.html.ini
@@ -0,0 +1,4 @@
+[CSSFontFaceRule.html]
+  [CSSFontFaceRule.cssText doesn't serialize with newlines]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini b/tests/wpt/metadata/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini
new file mode 100644
index 00000000000..e9bf55ee134
--- /dev/null
+++ b/tests/wpt/metadata/css/filter-effects/backdrop-filter-svg-foreignObject.html.ini
@@ -0,0 +1,2 @@
+[backdrop-filter-svg-foreignObject.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini b/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini
index 691c5bc64c7..1c19177769f 100644
--- a/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini
+++ b/tests/wpt/metadata/css/mediaqueries/prefers-contrast.html.ini
@@ -32,3 +32,15 @@
   [Should be parseable in JS: '(prefers-contrast: high)']
     expected: FAIL
 
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: more)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: less)']
+    expected: FAIL
+
+  [Should be parseable in a CSS stylesheet: '(prefers-contrast: less)']
+    expected: FAIL
+
+  [Should be parseable in JS: '(prefers-contrast: more)']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/custom-elements/CustomElementRegistry.html.ini b/tests/wpt/metadata/custom-elements/CustomElementRegistry.html.ini
index 4ed40c47a80..080959f0922 100644
--- a/tests/wpt/metadata/custom-elements/CustomElementRegistry.html.ini
+++ b/tests/wpt/metadata/custom-elements/CustomElementRegistry.html.ini
@@ -33,3 +33,18 @@
   [customElements.define must not throw when defining another custom element in a different global object during Get(constructor, "prototype")]
     expected: FAIL
 
+  [A promise returned by customElements.whenDefined must be resolved by "define"]
+    expected: FAIL
+
+  [customElements.whenDefined must return a new resolved promise each time invoked when the registry contains the entry with the given name]
+    expected: FAIL
+
+  [A promise returned by customElements.whenDefined must be resolved with the defined class once such class is defined]
+    expected: FAIL
+
+  [customElements.whenDefined must return a resolved promise when the registry contains the entry with the given name]
+    expected: FAIL
+
+  [A promise returned by customElements.whenDefined must be resolved with the defined class]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
index eace9567357..4b9fdba1aca 100644
--- a/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
+++ b/tests/wpt/metadata/dom/events/Event-dispatch-click.html.ini
@@ -9,3 +9,9 @@
   [disabled checkbox should be checked from dispatchEvent(new MouseEvent("click"))]
     expected: FAIL
 
+  [disabled radio should get legacy-canceled-activation behavior]
+    expected: FAIL
+
+  [disabled checkbox should get legacy-canceled-activation behavior]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/request/request-structure.html.ini b/tests/wpt/metadata/fetch/api/request/request-structure.html.ini
index 7ff4fa9a21f..d90b69a1a99 100644
--- a/tests/wpt/metadata/fetch/api/request/request-structure.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-structure.html.ini
@@ -5,6 +5,3 @@
   [Check isHistoryNavigation attribute]
     expected: FAIL
 
-  [Check destination attribute]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index ae06b635950..a0c94677fca 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,18 +315,27 @@
   [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index b2ffc8abf78..5c001592859 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript error]
+  [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/embed.https.sub.tentative.html.ini b/tests/wpt/metadata/fetch/metadata/embed.https.sub.tentative.html.ini
new file mode 100644
index 00000000000..ae0326e141c
--- /dev/null
+++ b/tests/wpt/metadata/fetch/metadata/embed.https.sub.tentative.html.ini
@@ -0,0 +1,20 @@
+[embed.https.sub.tentative.html]
+  expected: TIMEOUT
+  [Wrapper: Navigate to cross-site embed]
+    expected: NOTRUN
+
+  [Wrapper: cross-site embed]
+    expected: NOTRUN
+
+  [Wrapper: same-site embed]
+    expected: NOTRUN
+
+  [Wrapper: Navigate to same-origin embed]
+    expected: NOTRUN
+
+  [Wrapper: Navigate to same-site embed]
+    expected: NOTRUN
+
+  [Wrapper: same-origin embed]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/fetch/stale-while-revalidate/stale-image.html.ini b/tests/wpt/metadata/fetch/stale-while-revalidate/stale-image.html.ini
index 61c15b7e577..86b30d7f0dd 100644
--- a/tests/wpt/metadata/fetch/stale-while-revalidate/stale-image.html.ini
+++ b/tests/wpt/metadata/fetch/stale-while-revalidate/stale-image.html.ini
@@ -1,5 +1,4 @@
 [stale-image.html]
-  expected: TIMEOUT
   [Cache returns stale resource]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/fullscreen/api/document-fullscreen-enabled.html.ini b/tests/wpt/metadata/fullscreen/api/document-fullscreen-enabled.html.ini
new file mode 100644
index 00000000000..97dad996961
--- /dev/null
+++ b/tests/wpt/metadata/fullscreen/api/document-fullscreen-enabled.html.ini
@@ -0,0 +1,4 @@
+[document-fullscreen-enabled.html]
+  [Document#fullscreenEnabled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
new file mode 100644
index 00000000000..9ebc39234dc
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html.ini
@@ -0,0 +1,13 @@
+[failure-check-sequence.https.html]
+  [CSP check precedes COEP check - CSP header first]
+    expected: FAIL
+
+  [COEP check precedes X-Frame-Options check]
+    expected: FAIL
+
+  [CSP check precedes COEP check - COEP header first]
+    expected: FAIL
+
+  [CSP check precedes X-Frame-Options check]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index 385376c7321..51f8272a6de 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_4.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
new file mode 100644
index 00000000000..735a9a75a2a
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
@@ -0,0 +1,2 @@
+[cross-origin-objects-on-new-window.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..16fa2c5cfc1
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,4 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
index c4c74f8dac7..14f4195d366 100644
--- a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
+++ b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html.ini
@@ -1,22 +1,22 @@
 [canvas-createImageBitmap-e_srgb.html]
   expected: ERROR
   [createImageBitmap in e-sRGB from a transparent e-sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint8, transparency: false]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (BMP, GIF, ICO, JPG, PNG, WEBP) with resize.]
     expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a sRGB SVG image with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (BMP, ICO, PNG, WEBP) with resize.]
     expected: FAIL
@@ -25,10 +25,10 @@
     expected: NOTRUN
 
   [createImageBitmap in e-sRGB from a sRGB HTMLVideoElement with resize.]
-    expected: NOTRUN
+    expected: PRECONDITION_FAILED
 
   [createImageBitmap in e-sRGB from an opaque e-sRGB HTMLCanvasElement with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob with resize.]
     expected: NOTRUN
@@ -52,74 +52,119 @@
     expected: NOTRUN
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (gif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (avif) with resize.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (gif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (jpg) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (avif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (jpg) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (webp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB Blob (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (avif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (png) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (bmp) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB Blob (ico) with resize.]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (avif) with resize.]
-    expected: NOTRUN
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque e-sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque e-sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint16, transparency: true]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent e-sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent e-sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent e-sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque e-sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from an opaque sRGB ImageBitmap with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB OffscreenCanvas with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from a transparent sRGB ImageData with resize.]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint8, transparency: true]
+    expected: FAIL
+
+  [createImageBitmap in e-sRGB from color managed Blob with resize. blobPixelFormat: uint16, transparency: false]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini
index 185067c00c3..1bfea62ece1 100644
--- a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini
+++ b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html.ini
@@ -1,31 +1,13 @@
 [canvas-createPutGetImageData-colorManaged.html]
-  [Test color managed putImageData: {srgb, uint16} -> {srgb, uint8}]
-    expected: FAIL
-
   [Test color managed cretateImageData: {srgb, float16} -> {srgb, float32}]
     expected: FAIL
 
-  [Test color managed putImageData: {srgb, float32} -> {srgb, uint8}]
-    expected: FAIL
-
   [Test color managed getImageData: {srgb, float16} -> {srgb, float32}]
     expected: FAIL
 
-  [Test color managed putImageData: {srgb, uint16} -> {srgb, float16}]
-    expected: FAIL
-
-  [Test color managed putImageData: {srgb, uint8} -> {srgb, uint8}]
-    expected: FAIL
-
-  [Test color managed putImageData: {srgb, float32} -> {srgb, float16}]
-    expected: FAIL
-
   [Test color managed cretateImageData: {srgb, uint8} -> {srgb, uint8}]
     expected: FAIL
 
-  [Test color managed putImageData: {srgb, uint8} -> {srgb, float16}]
-    expected: FAIL
-
   [Test color managed getImageData: {srgb, uint8} -> {srgb, uint8}]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html.ini b/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html.ini
deleted file mode 100644
index 777cba0acb0..00000000000
--- a/tests/wpt/metadata/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[imageData-colorSpace.html]
-  [Test default color space: {undefined, float32} -> {srgb, float32}]
-    expected: FAIL
-
-  [Test color settings: {srgb, uint8}]
-    expected: FAIL
-
-  [Test color settings: {srgb, float32}]
-    expected: FAIL
-
-  [Test color settings: {srgb, uint16}]
-    expected: FAIL
-
-  [Test default color settings: {undefined, undefined} -> {srgb, uint8}]
-    expected: FAIL
-
-  [Test default storage format: {srgb, undefined} -> {srgb, uint8}]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/dom/elements/images/bypass-cache-revalidation.html.ini b/tests/wpt/metadata/html/dom/elements/images/bypass-cache-revalidation.html.ini
new file mode 100644
index 00000000000..6c43c977094
--- /dev/null
+++ b/tests/wpt/metadata/html/dom/elements/images/bypass-cache-revalidation.html.ini
@@ -0,0 +1,4 @@
+[bypass-cache-revalidation.html]
+  [Images can bypass no-cache]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index 199e4490973..33bbf1cddd9 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -1795,6 +1795,24 @@
   [Document interface: calling execCommand(DOMString, optional boolean, optional DOMString) on documentWithHandlers with too few arguments must throw TypeError]
     expected: FAIL
 
+  [Window interface: window must inherit property "crossOriginIsolated" with the proper type]
+    expected: FAIL
+
+  [Window interface: window must inherit property "originIsolated" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute isSecureContext]
+    expected: FAIL
+
+  [Window interface: attribute originIsolated]
+    expected: FAIL
+
+  [Window interface: attribute crossOriginIsolated]
+    expected: FAIL
+
+  [Window interface: window must inherit property "isSecureContext" with the proper type]
+    expected: FAIL
+
 
 [idlharness.https.html?include=HTML.*]
   [HTMLTableSectionElement interface: document.createElement("tfoot") must inherit property "align" with the proper type]
@@ -3732,3 +3750,18 @@
   [HTMLLinkElement interface: attribute disabled]
     expected: FAIL
 
+  [HTMLIFrameElement interface: attribute loading]
+    expected: FAIL
+
+  [HTMLMediaElement interface: attribute preservesPitch]
+    expected: FAIL
+
+  [HTMLMediaElement interface: document.createElement("audio") must inherit property "preservesPitch" with the proper type]
+    expected: FAIL
+
+  [HTMLMediaElement interface: new Audio() must inherit property "preservesPitch" with the proper type]
+    expected: FAIL
+
+  [HTMLMediaElement interface: document.createElement("video") must inherit property "preservesPitch" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/idlharness.worker.js.ini b/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
index 9175e384f08..aada128b2b6 100644
--- a/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.worker.js.ini
@@ -74,9 +74,6 @@
   [Path2D interface: existence and properties of interface object]
     expected: FAIL
 
-  [SharedWorker interface: existence and properties of interface object]
-    expected: FAIL
-
   [WorkerGlobalScope interface: self must inherit property "ononline" with the proper type]
     expected: FAIL
 
@@ -551,3 +548,18 @@
   [ImageBitmapRenderingContext interface: operation transferFromImageBitmap(ImageBitmap?)]
     expected: FAIL
 
+  [WorkerGlobalScope interface: attribute isSecureContext]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "crossOriginIsolated" with the proper type]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "isSecureContext" with the proper type]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: attribute crossOriginIsolated]
+    expected: FAIL
+
+  [WebSocket interface: new WebSocket("ws://invalid") must inherit property "extensions" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index d1ca01ebc5f..6b68e9094e4 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -10,7 +9,7 @@
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini
new file mode 100644
index 00000000000..b49fbe68d59
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html.ini
@@ -0,0 +1,4 @@
+[fieldset-overflow-cssomview.html]
+  [Test cssom-view API for FIELDSET]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 98163335e40..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,6 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini
new file mode 100644
index 00000000000..fd0a4743026
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html.ini
@@ -0,0 +1,4 @@
+[no-cuechange-before-play.html]
+  [Ensure that the 'cuechange' event is not fired before video playback has begun.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..cb0211f1d21 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..963d4cd20ef 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
new file mode 100644
index 00000000000..75cdcf5bf04
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html.ini
@@ -0,0 +1,2 @@
+[image-compositing-large-scale-change.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini
new file mode 100644
index 00000000000..8195569d430
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/reload.window.js.ini
@@ -0,0 +1,5 @@
+[reload.window.html]
+  expected: TIMEOUT
+  [Reloading a document.open()'d page should reload the URL of the entry realm's responsible document]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini b/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini
index 2848e9b5a9f..6690531bf4b 100644
--- a/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini
+++ b/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html.ini
@@ -671,3 +671,57 @@
   [registerProtocolHandler: Invalid URL "https://%sweb-platform.test:8443/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html" should throw (but after scheme)]
     expected: FAIL
 
+  [registerProtocolHandler: Attempting to override the "web+non*alpha*are*forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+Kelvinsign" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+latinsmallletterlongſ" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "web+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+non*alpha*are*forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+namewithid123" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+Kelvinsign" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+namewithtrailingspace " protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+préfixewithaccent" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+préfixewithaccent" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+spaces are forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+spaces are forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+namewithid123" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+underscores_are_forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: Attempting to override the "web+underscores_are_forbidden" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "web+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+latinsmallletterlongſ" protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
+  [registerProtocolHandler: Attempting to override the "web+namewithtrailingspace " protocol should throw SECURITY_ERR.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini b/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini
new file mode 100644
index 00000000000..c3aabcfe17d
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html.ini
@@ -0,0 +1,55 @@
+[protocol.tentative.https.html]
+  [unregisterProtocolHandler: overriding the "ipfs" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "did" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "cabal" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "ethereum" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "dweb" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "ssb" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ethereum" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "did" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "hyper" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "ipns" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ssb" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ipns" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "cabal" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "dat" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "dweb" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "hyper" protocol should work]
+    expected: FAIL
+
+  [registerProtocolHandler: overriding the "ipfs" protocol should work]
+    expected: FAIL
+
+  [unregisterProtocolHandler: overriding the "dat" protocol should work]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini
new file mode 100644
index 00000000000..b8a231b14bf
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js.ini
@@ -0,0 +1,5 @@
+[cleanup-prevented-with-reference.optional.any.html]
+  expected: ERROR
+
+[cleanup-prevented-with-reference.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini
new file mode 100644
index 00000000000..4fc93faaf3d
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js.ini
@@ -0,0 +1,5 @@
+[cleanup-prevented-with-unregister.optional.any.worker.html]
+  expected: ERROR
+
+[cleanup-prevented-with-unregister.optional.any.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini
new file mode 100644
index 00000000000..481060a9e16
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js.ini
@@ -0,0 +1,5 @@
+[gc-has-one-chance-to-call-cleanupCallback.optional.any.worker.html]
+  expected: ERROR
+
+[gc-has-one-chance-to-call-cleanupCallback.optional.any.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini
new file mode 100644
index 00000000000..ebac7a3e870
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/holdings-multiple-values.optional.any.js.ini
@@ -0,0 +1,57 @@
+[holdings-multiple-values.optional.any.html]
+  [`""` as registered holding value]
+    expected: FAIL
+
+  [`Symbol(1)` as registered holding value]
+    expected: FAIL
+
+  [`true` as registered holding value]
+    expected: FAIL
+
+  [`undefined` as registered holding value]
+    expected: FAIL
+
+  [Requires FinalizationRegistry.prototype.cleanupSome]
+    expected: FAIL
+
+  [`{}` as registered holding value]
+    expected: FAIL
+
+  [`false` as registered holding value]
+    expected: FAIL
+
+  [`42` as registered holding value]
+    expected: FAIL
+
+  [`null` as registered holding value]
+    expected: FAIL
+
+
+[holdings-multiple-values.optional.any.worker.html]
+  [`""` as registered holding value]
+    expected: FAIL
+
+  [`Symbol(1)` as registered holding value]
+    expected: FAIL
+
+  [`true` as registered holding value]
+    expected: FAIL
+
+  [`undefined` as registered holding value]
+    expected: FAIL
+
+  [Requires FinalizationRegistry.prototype.cleanupSome]
+    expected: FAIL
+
+  [`{}` as registered holding value]
+    expected: FAIL
+
+  [`false` as registered holding value]
+    expected: FAIL
+
+  [`42` as registered holding value]
+    expected: FAIL
+
+  [`null` as registered holding value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/reentrancy.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/reentrancy.optional.any.js.ini
new file mode 100644
index 00000000000..d4990b12ddf
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/reentrancy.optional.any.js.ini
@@ -0,0 +1,5 @@
+[reentrancy.optional.any.html]
+  expected: ERROR
+
+[reentrancy.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini
new file mode 100644
index 00000000000..94bfc185df9
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js.ini
@@ -0,0 +1,5 @@
+[return-undefined-with-gc.optional.any.html]
+  expected: ERROR
+
+[return-undefined-with-gc.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini b/tests/wpt/metadata/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini
new file mode 100644
index 00000000000..4ebd816db1f
--- /dev/null
+++ b/tests/wpt/metadata/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js.ini
@@ -0,0 +1,5 @@
+[unregister-cleaned-up-cell.optional.any.html]
+  expected: ERROR
+
+[unregister-cleaned-up-cell.optional.any.worker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/selection/contenteditable/collapse.html.ini b/tests/wpt/metadata/selection/contenteditable/collapse.html.ini
new file mode 100644
index 00000000000..43deb417587
--- /dev/null
+++ b/tests/wpt/metadata/selection/contenteditable/collapse.html.ini
@@ -0,0 +1,10 @@
+[collapse.html]
+  [Selection.collapse() must succeed for the ancestor]
+    expected: FAIL
+
+  [Selection.collapse() must succeed for the descendant]
+    expected: FAIL
+
+  [Selection.collapse() must succeed across siblings]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/selection/contenteditable/modify.tentative.html.ini b/tests/wpt/metadata/selection/contenteditable/modify.tentative.html.ini
new file mode 100644
index 00000000000..aec06f60588
--- /dev/null
+++ b/tests/wpt/metadata/selection/contenteditable/modify.tentative.html.ini
@@ -0,0 +1,4 @@
+[modify.tentative.html]
+  [Selection.modify() must not select outside of the host]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
index b84126a1e7a..daae8e6128f 100644
--- a/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
+++ b/tests/wpt/metadata/url/a-element-xhtml.xhtml.ini
@@ -60,3 +60,39 @@
   [Parsing: <http://a^b> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <path> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <a/..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </.//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//> against <about:blank>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/a-element.html.ini b/tests/wpt/metadata/url/a-element.html.ini
index f39e7394ed1..516c5da4db8 100644
--- a/tests/wpt/metadata/url/a-element.html.ini
+++ b/tests/wpt/metadata/url/a-element.html.ini
@@ -60,3 +60,39 @@
   [Parsing: <http://a^b> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <path> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <a/..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </.//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//> against <about:blank>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/url-constructor.html.ini b/tests/wpt/metadata/url/url-constructor.html.ini
index 94aba66b81c..712d81d668d 100644
--- a/tests/wpt/metadata/url/url-constructor.html.ini
+++ b/tests/wpt/metadata/url/url-constructor.html.ini
@@ -51,3 +51,39 @@
   [Parsing: <http://a^b> against <about:blank>]
     expected: FAIL
 
+  [Parsing: <> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <path> against <non-spec:/..//p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <a/..//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/..//path> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: </.//path> against <non-spec:/p>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/.//> against <about:blank>]
+    expected: FAIL
+
+  [Parsing: <non-spec:/a/..//> against <about:blank>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/url-setters.html.ini b/tests/wpt/metadata/url/url-setters.html.ini
index 4da0fbc2df3..b448b758aa8 100644
--- a/tests/wpt/metadata/url/url-setters.html.ini
+++ b/tests/wpt/metadata/url/url-setters.html.ini
@@ -1,5 +1,6 @@
 [url-setters.html]
   type: testharness
+  expected: CRASH
   [Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special. Note: this may change, see https://github.com/whatwg/url/issues/104]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/wasm/jsapi/memory/constructor.any.js.ini b/tests/wpt/metadata/wasm/jsapi/memory/constructor.any.js.ini
index 4f50e76a2de..8b107dc471f 100644
--- a/tests/wpt/metadata/wasm/jsapi/memory/constructor.any.js.ini
+++ b/tests/wpt/metadata/wasm/jsapi/memory/constructor.any.js.ini
@@ -2,8 +2,14 @@
   [Shared memory]
     expected: FAIL
 
+  [Proxy descriptor]
+    expected: FAIL
+
 
 [constructor.any.html]
   [Shared memory]
     expected: FAIL
 
+  [Proxy descriptor]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini
new file mode 100644
index 00000000000..618402237da
--- /dev/null
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html.ini
@@ -0,0 +1,2 @@
+[extended-audioworkletnode-with-parameters.https.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini
new file mode 100644
index 00000000000..f62de3b230e
--- /dev/null
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-delaynode-interface/delay-test.html.ini
@@ -0,0 +1,13 @@
+[delay-test.html]
+  [# AUDIT TASK RUNNER FINISHED: 1 out of 1 tasks were failed.]
+    expected: FAIL
+
+  [Executing "test0"]
+    expected: FAIL
+
+  [X Creating ConstantSourceNode(context) and DelayNode(context) incorrectly threw ReferenceError: "DelayNode is not defined".]
+    expected: FAIL
+
+  [X Setting delayTime to 3 frames incorrectly threw TypeError: "delay is undefined".]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/execute_script/execute.py.ini b/tests/wpt/metadata/webdriver/tests/execute_script/execute.py.ini
index 84ba421e8aa..a405aeaba1c 100644
--- a/tests/wpt/metadata/webdriver/tests/execute_script/execute.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/execute_script/execute.py.ini
@@ -23,3 +23,6 @@
   [test_abort_by_user_prompt_twice[alert\]]
     expected: FAIL
 
+  [test_opening_new_window_keeps_current_window_handle]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webstorage/idlharness.window.js.ini b/tests/wpt/metadata/webstorage/idlharness.window.js.ini
deleted file mode 100644
index e663f693ac3..00000000000
--- a/tests/wpt/metadata/webstorage/idlharness.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[idlharness.window.html]
-  [idlharness]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini b/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini
new file mode 100644
index 00000000000..c91f0fab159
--- /dev/null
+++ b/tests/wpt/metadata/webxr/hand-input/idlharness.https.window.js.ini
@@ -0,0 +1,229 @@
+[idlharness.https.window.html]
+  [XRHand interface object name]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRJointPose interface: attribute radius]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: iterable<XRJointSpace>]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRFrame interface: operation fillJointRadii(sequence<XRJointSpace>, Float32Array)]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant WRIST on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRFrame interface: operation getJointPose(XRJointSpace, XRSpace)]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRJointSpace interface object length]
+    expected: FAIL
+
+  [XRHand interface: constant THUMB_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRJointPose interface object name]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant WRIST on interface prototype object]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRFrame interface: operation fillPoses(sequence<XRSpace>, XRSpace, Float32Array)]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_INTERMEDIATE on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_DISTAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_DISTAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRInputSource interface: attribute hand]
+    expected: FAIL
+
+  [XRHand interface: constant RING_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRJointSpace interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRJointPose interface object length]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_TIP on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_METACARPAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: attribute length]
+    expected: FAIL
+
+  [XRHand interface object length]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_TIP on interface object]
+    expected: FAIL
+
+  [XRJointPose interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: operation joint(unsigned long)]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_PHALANX_INTERMEDIATE on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant RING_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRJointSpace interface object name]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_PHALANX_PROXIMAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant INDEX_PHALANX_PROXIMAL on interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRHand interface: constant LITTLE_METACARPAL on interface object]
+    expected: FAIL
+
+  [XRHand interface: constant MIDDLE_METACARPAL on interface prototype object]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
deleted file mode 100644
index fe8654e447c..00000000000
--- a/tests/wpt/metadata/workers/WorkerGlobalScope-close.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[WorkerGlobalScope-close.html]
-  [Test sending a message after closing.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/workers/Worker_script_mimetype.htm.ini b/tests/wpt/metadata/workers/Worker_script_mimetype.htm.ini
new file mode 100644
index 00000000000..979060db2cd
--- /dev/null
+++ b/tests/wpt/metadata/workers/Worker_script_mimetype.htm.ini
@@ -0,0 +1,4 @@
+[Worker_script_mimetype.htm]
+  [HTTP(S) URLs which respond with text/plain MIME type must not work]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini
new file mode 100644
index 00000000000..5ea9043210b
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html.ini
@@ -0,0 +1,8 @@
+[message-classic-DOMException.html]
+  expected: TIMEOUT
+  [Throw DOMException-TypeError in onerror: classic: handler]
+    expected: TIMEOUT
+
+  [Throw DOMException-TypeError in onerror: classic: listener]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini
new file mode 100644
index 00000000000..037022cd8ac
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html.ini
@@ -0,0 +1,8 @@
+[message-classic-Error.html]
+  expected: TIMEOUT
+  [Throw Error in onerror: classic: handler]
+    expected: TIMEOUT
+
+  [Throw Error in onerror: classic: listener]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini
new file mode 100644
index 00000000000..9470cff7a9a
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html.ini
@@ -0,0 +1,8 @@
+[message-module-DOMException.html]
+  expected: TIMEOUT
+  [Throw DOMException-TypeError in onerror: module: handler]
+    expected: TIMEOUT
+
+  [Throw DOMException-TypeError in onerror: module: listener]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
new file mode 100644
index 00000000000..abfd454634f
--- /dev/null
+++ b/tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html.ini
@@ -0,0 +1,8 @@
+[message-module-Error.html]
+  expected: TIMEOUT
+  [Throw Error in onerror: module: listener]
+    expected: TIMEOUT
+
+  [Throw Error in onerror: module: handler]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index fbdef35656e..882b63058dc 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -610,8 +610,8 @@ jobs:
       channel: stable
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
-  # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/18995 + https://github.com/web-platform-tests/wpt/issues/20887 + https://github.com/web-platform-tests/wpt/issues/22175 + https://github.com/web-platform-tests/wpt/issues/23630
-  - script: ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel stable safari --exclude /pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html --exclude /pointerevents/pointerevent_pointercapture_in_frame.html --exclude /web-share/share-sharePromise-internal-slot.https.html --exclude /webdriver/tests/perform_actions/pointer_tripleclick.py
+  # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/18995 + https://github.com/web-platform-tests/wpt/issues/20887 + https://github.com/web-platform-tests/wpt/issues/22175 + https://github.com/web-platform-tests/wpt/issues/23630 + https://github.com/web-platform-tests/wpt/issues/25294
+  - script: ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel stable safari --exclude /pointerevents/pointerevent_pointercapture-not-lost-in-chorded-buttons.html --exclude /pointerevents/pointerevent_pointercapture_in_frame.html --exclude /web-share/share-sharePromise-internal-slot.https.html --exclude /webdriver/tests/perform_actions/pointer_tripleclick.py --exclude /is-input-pending/security/cross-origin-subframe-overlap.sub.html --exclude /web-share/share-url-invalid.https.html
     displayName: 'Run tests'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
@@ -646,8 +646,8 @@ jobs:
   - template: tools/ci/azure/install_safari.yml
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
-  # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/18995 + https://github.com/web-platform-tests/wpt/issues/20887 + https://github.com/web-platform-tests/wpt/issues/23630
-  - script: ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel preview safari --exclude /pointerevents/pointerevent_pointercapture_in_frame.html --exclude /web-share/share-sharePromise-internal-slot.https.html --exclude /webdriver/tests/perform_actions/pointer_tripleclick.py
+  # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/18995 + https://github.com/web-platform-tests/wpt/issues/20887 + https://github.com/web-platform-tests/wpt/issues/23630 + https://github.com/web-platform-tests/wpt/issues/25417
+  - script: ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-mach - --log-mach-level info --channel preview safari --exclude /pointerevents/pointerevent_pointercapture_in_frame.html --exclude /web-share/share-sharePromise-internal-slot.https.html --exclude /webdriver/tests/perform_actions/pointer_tripleclick.py --exclude /web-share/share-url-invalid.https.html
     displayName: 'Run tests'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
diff --git a/tests/wpt/web-platform-tests/.github/workflows/regen_certs.yml b/tests/wpt/web-platform-tests/.github/workflows/regen_certs.yml
new file mode 100644
index 00000000000..a2f5834bfc9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/.github/workflows/regen_certs.yml
@@ -0,0 +1,33 @@
+name: Regenerate WPT certificates
+on:
+  schedule:
+    # Our certificates are good for ~1 year, but we regenerate them every
+    # month to be sure.
+    - cron: '0 0 12 * *'
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Regenerate certs
+      # Use a conditional step instead of a conditional job to work around #20700.
+      if: github.repository == 'web-platform-tests/wpt'
+      run: |
+        python wpt make-hosts-file | sudo tee -a /etc/hosts
+        python wpt regen-certs --force
+    - name: Commit and create pull request
+      # Use a conditional step instead of a conditional job to work around #20700.
+      if: github.repository == 'web-platform-tests/wpt'
+      uses: peter-evans/create-pull-request@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        commit-message: Automated regeneration of WPT certificates
+        title: Regenerate WPT certificates
+        body: |
+          This automated pull request renews the core WPT certificates.
+
+          Pull request auto-generated by [create-pull-request][1]
+
+          [1]: https://github.com/peter-evans/create-pull-request
+        branch: actions/regen-certs
diff --git a/tests/wpt/web-platform-tests/FileAPI/file/File-constructor.html b/tests/wpt/web-platform-tests/FileAPI/file/File-constructor.html
index 63fda5e8d17..3477e4ada16 100644
--- a/tests/wpt/web-platform-tests/FileAPI/file/File-constructor.html
+++ b/tests/wpt/web-platform-tests/FileAPI/file/File-constructor.html
@@ -84,7 +84,8 @@ function test_second_argument(arg2, expectedFileName, testName) {
 }
 
 test_second_argument("dummy", "dummy", "Using fileName");
-test_second_argument("dummy/foo", "dummy:foo", "Using special character in fileName");
+test_second_argument("dummy/foo", "dummy/foo",
+                     "No replacement when using special character in fileName");
 test_second_argument(null, "null", "Using null fileName");
 test_second_argument(1, "1", "Using number fileName");
 test_second_argument('', '', "Using empty string fileName");
diff --git a/tests/wpt/web-platform-tests/FileAPI/idlharness-manual.html b/tests/wpt/web-platform-tests/FileAPI/idlharness-manual.html
index 199f49db4db..c1d8b0c7149 100644
--- a/tests/wpt/web-platform-tests/FileAPI/idlharness-manual.html
+++ b/tests/wpt/web-platform-tests/FileAPI/idlharness-manual.html
@@ -13,13 +13,8 @@
   <body>
     <h1>File API manual IDL tests</h1>
 
-    <div>
-      <p>Test steps:</p>
-      <ol>
-        <li>Download <a href="support/upload.txt">upload.txt</a> to local.</li>
-        <li>Select the local upload.txt file to run the test.</li>
-      </ol>
-    </div>
+    <p>Either download <a href="support/upload.txt">upload.txt</a> and select it below or select an
+    arbitrary local file.</p>
 
     <form name="uploadData">
       <input type="file" id="fileChooser">
@@ -28,33 +23,23 @@
     <div id="log"></div>
 
     <script>
-      var fileInput;
+      const fileInput = document.querySelector("#fileChooser");
 
-      setup(function() {
-        fileInput = document.querySelector("#fileChooser")
-      }, {explicit_done: true, explicit_timeout: true});
+      setup({explicit_timeout: true});
 
-      on_event(fileInput, "change", async function(evt) {
-        const idl = await fetch('/interfaces/FileAPI.idl').then(r => r.text());
-        const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
-        const html = await fetch('/interfaces/html.idl').then(r => r.text());
-        const url = await fetch('/interfaces/url.idl').then(r => r.text());
-
-        const idl_array = new IdlArray();
-        idl_array.add_idls(idl);
-        idl_array.add_dependency_idls(url);
-        idl_array.add_dependency_idls(html);
-        idl_array.add_dependency_idls(dom);
-        idl_array.add_untested_idls("[Exposed=(Window,Worker)] interface ArrayBuffer {};");
-
-        idl_array.add_objects({
-          FileList: [fileInput.files],
-          File: [fileInput.files[0]],
-        });
-        idl_array.test();
-
-        done();
-      });
+      idl_test(
+        ['FileAPI'],
+        ['dom', 'html', 'url'],
+        async idl_array => {
+          await new Promise(resolve => {
+            on_event(fileInput, "change", resolve);
+          });
+          idl_array.add_objects({
+            FileList: [fileInput.files],
+            File: [fileInput.files[0]],
+          });
+        }
+      );
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js
index ed05d27646f..cd4e5b63419 100644
--- a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js
+++ b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/es-exceptions/DOMException-custom-bindings.any.js
@@ -27,7 +27,7 @@ test(() => {
   const getter = Object.getOwnPropertyDescriptor(DOMException.prototype, "message").get;
 
   assert_throws_js(TypeError, () => getter.apply({}));
-}, "message getter performs brand checks (i.e. is not [LenientThis]");
+}, "message getter performs brand checks (i.e. is not [LegacyLenientThis])");
 
 test(() => {
   const e = new DOMException("message", "name");
@@ -44,7 +44,7 @@ test(() => {
   const getter = Object.getOwnPropertyDescriptor(DOMException.prototype, "name").get;
 
   assert_throws_js(TypeError, () => getter.apply({}));
-}, "name getter performs brand checks (i.e. is not [LenientThis]");
+}, "name getter performs brand checks (i.e. is not [LegacyLenientThis])");
 
 test(() => {
   const e = new DOMException("message", "name");
@@ -61,7 +61,7 @@ test(() => {
   const getter = Object.getOwnPropertyDescriptor(DOMException.prototype, "code").get;
 
   assert_throws_js(TypeError, () => getter.apply({}));
-}, "code getter performs brand checks (i.e. is not [LenientThis]");
+}, "code getter performs brand checks (i.e. is not [LegacyLenientThis])");
 
 test(() => {
   const e = new DOMException("message", "InvalidCharacterError");
diff --git a/tests/wpt/web-platform-tests/WebIDL/idlharness.any.js b/tests/wpt/web-platform-tests/WebIDL/idlharness.any.js
new file mode 100644
index 00000000000..efc475a9879
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebIDL/idlharness.any.js
@@ -0,0 +1,16 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+"use strict";
+
+idl_test(
+  ['WebIDL'],
+  [],
+  idl_array => {
+    idl_array.add_objects({
+      DOMException: ['new DOMException()',
+                     'new DOMException("my message")',
+                     'new DOMException("my message", "myName")']
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/WebIDL/idlharness.html b/tests/wpt/web-platform-tests/WebIDL/idlharness.html
deleted file mode 100644
index 2683aae9cb6..00000000000
--- a/tests/wpt/web-platform-tests/WebIDL/idlharness.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>WebIDL IDL tests</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-
-<div id=log></div>
-<script>
-"use strict";
-var idlArray = new IdlArray();
-
-function doTest(idl) {
-  idlArray.add_idls(idl);
-  idlArray.add_objects({
-    DOMException: ['new DOMException()',
-                   'new DOMException("my message")',
-                   'new DOMException("my message", "myName")'],
-  });
-  idlArray.test();
-}
-
-promise_test(function() {
-  return fetch("/interfaces/WebIDL.idl").then(response => response.text())
-                                        .then(doTest);
-}, "Test driver");
-</script>
diff --git a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js b/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js
index 01cabe89bb6..dd385689cb9 100644
--- a/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js
+++ b/tests/wpt/web-platform-tests/bluetooth/resources/bluetooth-test.js
@@ -18,19 +18,6 @@ function loadScript(path) {
   return promise;
 }
 
-/**
- * Loads the scripts in |paths|.
- * @param {string[]} paths
- * @returns {Promise<void>} A promise chain that resolves when all scripts have
- *     finished loading.
- */
-async function loadScripts(paths) {
-  for (let path of paths) {
-    await loadScript(path);
-  }
-  return;
-}
-
 /**
  * Performs the Chromium specific setup necessary to run the tests in the
  * Chromium browser. This test file is shared between Web Platform Tests and
@@ -42,37 +29,35 @@ async function loadScripts(paths) {
  * @returns {Promise<void>} Resolves when Chromium specific setup is complete.
  */
 async function performChromiumSetup() {
-  // Make sure we are actually on Chromium with Mojo enabled.
-  if (typeof Mojo === 'undefined') {
+  const chromiumResources = [
+    '/gen/content/test/data/mojo_web_test_helper_test.mojom.js',
+    '/gen/device/bluetooth/public/mojom/uuid.mojom.js',
+    '/gen/url/mojom/origin.mojom.js',
+    '/gen/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.js',
+    '/gen/content/web_test/common/fake_bluetooth_chooser.mojom.js',
+  ];
+  // Determine path prefixes.
+  let resPrefix = '/resources';
+  let extra = ['/resources/chromium/web-bluetooth-test.js'];
+  const pathname = window.location.pathname;
+  if (pathname.includes('/web_tests/')) {
+    let root = pathname.match(/.*(?:web_tests)/);
+    resPrefix = `${root}/external/wpt/resources`;
+    extra = [
+      `${root}/external/wpt/resources/chromium/web-bluetooth-test.js`,
+      `${root}/resources/bluetooth/bluetooth-fake-adapter.js`,
+    ];
+  }
+
+  await loadScript(`${resPrefix}/test-only-api.js`);
+  if (!isChromiumBased) {
     return;
   }
 
-  // Load the Chromium-specific resources.
-  let prefix = '/resources/chromium';
-  let genPrefix = '/gen';
-  let extra = [];
-  const pathname = window.location.pathname;
-  if (pathname.includes('/LayoutTests/') || pathname.includes('/web_tests/')) {
-    let root = pathname.match(/.*(?:LayoutTests|web_tests)/);
-    prefix = `${root}/external/wpt/resources/chromium`;
-    extra = [
-      `${root}/resources/bluetooth/bluetooth-fake-adapter.js`,
-    ];
-    genPrefix = 'file:///gen';
-  } else if (window.location.pathname.startsWith('/bluetooth/https/')) {
-    extra = [
-      '/js-test-resources/bluetooth/bluetooth-fake-adapter.js',
-    ];
+  await loadMojoResources(chromiumResources);
+  for (const path of extra) {
+    await loadScript(path);
   }
-  await loadScripts([
-    `${genPrefix}/layout_test_data/mojo/public/js/mojo_bindings.js`,
-    `${genPrefix}/content/test/data/mojo_web_test_helper_test.mojom.js`,
-    `${genPrefix}/device/bluetooth/public/mojom/uuid.mojom.js`,
-    `${genPrefix}/url/mojom/origin.mojom.js`,
-    `${genPrefix}/device/bluetooth/public/mojom/test/fake_bluetooth.mojom.js`,
-    `${genPrefix}/content/shell/common/web_test/fake_bluetooth_chooser.mojom.js`,
-    `${prefix}/web-bluetooth-test.js`,
-  ].concat(extra));
 
   // Call setBluetoothFakeAdapter() to clean up any fake adapters left over by
   // legacy tests. Legacy tests that use setBluetoothFakeAdapter() sometimes
@@ -98,8 +83,10 @@ async function performChromiumSetup() {
  */
 function bluetooth_test(test_function, name, properties) {
   return promise_test(async (t) => {
+    assert_implements(navigator.bluetooth, 'missing navigator.bluetooth');
     // Trigger Chromium-specific setup.
     await performChromiumSetup();
+    assert_implements(navigator.bluetooth.test, 'missing navigator.bluetooth.test');
     await test_function(t);
     let consumed = await navigator.bluetooth.test.allResponsesConsumed();
     assert_true(consumed);
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-svg-script-removal.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-svg-script-removal.https.html
new file mode 100644
index 00000000000..cd1a551d9d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-svg-script-removal.https.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>
+  Async Clipboard write ([image/svg+xml ClipboardItem]) -> readSvg (and remove scripts) tests
+</title>
+<link rel="help" href="https://w3c.github.io/clipboard-apis/#async-clipboard-api">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+'use strict';
+// This function removes extra spaces between tags in svg. For example, the
+// following svg: "<svg> <g> </g>     </svg>" would turn into this
+//           svg: "<svg> <g> </g> </svg>"
+// We remove the extra spaces because in svg they are considered equivalent,
+// but when we are comparing for equality the spaces make a difference.
+function reformatSvg(svg) {
+  const parser = new DOMParser();
+  const svgString =
+    parser.parseFromString(svg, 'text/html').documentElement.innerHTML;
+  const reformattedString = svgString.replace(/\>\s*\</g, '> <');
+  return reformattedString;
+}
+
+// The string must be concatenated in this way because the html parser
+// will recognize a script tag even in quotes as a real script tag. By
+// splitting it up in this way we avoid that error.
+const svg_with_script =
+  `<svg> <script>const a = 5;</scr' + 'ipt>
+   <a href="javascript:alert(2)"> test </a> </svg>`;
+const svg_without_script =
+  `<svg> </svg>`;
+promise_test(async t => {
+  await test_driver.set_permission({name: 'clipboard-read'}, 'granted');
+  await test_driver.set_permission({name: 'clipboard-write'}, 'granted');
+  const blobInput = new Blob([svg_with_script], {type: 'image/svg+xml'});
+  const clipboardItem = new ClipboardItem({'image/svg+xml': blobInput});
+  await navigator.clipboard.write([clipboardItem]);
+  const clipboardItems =
+      await navigator.clipboard.read({type: 'image/svg+xml'});
+
+  const svg = clipboardItems[0];
+  assert_equals(svg.types.length, 1);
+  assert_equals(svg.types[0], 'image/svg+xml');
+
+  const blobOutput = await svg.getType('image/svg+xml');
+  assert_equals(blobOutput.type, 'image/svg+xml');
+
+  const blobText = await (new Response(blobOutput)).text();
+
+  const outputSvg = reformatSvg(blobText);
+  const inputSvg = reformatSvg(svg_without_script);
+  assert_equals(outputSvg, inputSvg);
+}, 'Verify write and read clipboard with scripts removed given image/svg+xml: '
+    + svg_with_script);
+</script>
diff --git a/tests/wpt/web-platform-tests/clipboard-apis/async-write-svg-read-svg.https.html b/tests/wpt/web-platform-tests/clipboard-apis/async-write-svg-read-svg.https.html
new file mode 100644
index 00000000000..19c91597c11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/clipboard-apis/async-write-svg-read-svg.https.html
@@ -0,0 +1,56 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>
+  Async Clipboard write ([image/svg+xml ClipboardItem]) -> read and write svg tests
+</title>
+<link rel="help" href="https://w3c.github.io/clipboard-apis/#async-clipboard-api">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+'use strict';
+// This function removes extra spaces between tags in svg. For example, the
+// following html: "<svg> <g> </g>   </svg>" would turn into this
+//           html: "<svg> <g> </g>   </svg>"
+// We remove the extra spaces because in svg they are considered equivalent,
+// but when we are comparing for equality the spaces make a difference.
+function reformatSvg(svg) {
+  const parser = new DOMParser();
+  const svgString =
+        parser.parseFromString(svg, 'text/html').documentElement.innerHTML;
+  const reformattedString = svgString.replace(/\>\s*\</g, '> <');
+  return reformattedString;
+}
+
+async function readWriteTest(textInput) {
+  await test_driver.set_permission({name: 'clipboard-read'}, 'granted');
+  await test_driver.set_permission({name: 'clipboard-write'}, 'granted');
+  const blobInput = new Blob([textInput], {type: 'image/svg+xml'});
+  const clipboardItem = new ClipboardItem({'image/svg+xml': blobInput});
+  await navigator.clipboard.write([clipboardItem]);
+  const clipboardItems =
+      await navigator.clipboard.read({type: 'image/svg+xml'});
+
+  const svg = clipboardItems[0];
+  assert_equals(svg.types.length, 1);
+  assert_equals(svg.types[0], 'image/svg+xml');
+
+  const blobOutput = await svg.getType('image/svg+xml');
+  assert_equals(blobOutput.type, 'image/svg+xml');
+
+  const blobText = await (new Response(blobOutput)).text();
+  const outputSvg = reformatSvg(blobText);
+  const inputSvg = reformatSvg(textInput);
+  assert_equals(outputSvg, inputSvg);
+}
+const testCases = ['<svg></svg>',
+                   '<svg> <circle cx="50" cy="50" r="40" /> </svg>'];
+
+promise_test(async t => {
+  for (const testCase of testCases) {
+    await readWriteTest(testCase);
+  }
+}, 'Verify read and write of some image/svg+xml content');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/svg.py b/tests/wpt/web-platform-tests/common/security-features/subresource/svg.py
index 4f29e4639ec..9f965ae98d2 100644
--- a/tests/wpt/web-platform-tests/common/security-features/subresource/svg.py
+++ b/tests/wpt/web-platform-tests/common/security-features/subresource/svg.py
@@ -13,8 +13,8 @@ def generate_payload(request, server_data):
 
 def generate_payload_embedded(request, server_data):
     return subresource.get_template(u"svg.embedded.template") % {
-        b"id": request.GET[b"id"],
-        b"property": request.GET[b"property"]}
+        u"id": isomorphic_decode(request.GET[b"id"]),
+        u"property": isomorphic_decode(request.GET[b"property"])}
 
 def generate_report_headers_payload(request, server_data):
     stashed_data = request.server.stash.take(request.GET[b"id"])
diff --git a/tests/wpt/web-platform-tests/common/stringifiers.js b/tests/wpt/web-platform-tests/common/stringifiers.js
index 4ef7a1bfeda..18de6c8c5b3 100644
--- a/tests/wpt/web-platform-tests/common/stringifiers.js
+++ b/tests/wpt/web-platform-tests/common/stringifiers.js
@@ -2,7 +2,7 @@
  * Runs tests for <http://heycam.github.io/webidl/#es-stringifier>.
  * @param {Object} aObject - object to test
  * @param {string} aAttribute - IDL attribute name that is annotated with `stringifier`
- * @param {boolean} aIsUnforgeable - whether the IDL attribute is `[Unforgeable]`
+ * @param {boolean} aIsUnforgeable - whether the IDL attribute is `[LegacyUnforgeable]`
  */
 function test_stringifier_attribute(aObject, aAttribute, aIsUnforgeable) {
   // Step 1.
diff --git a/tests/wpt/web-platform-tests/contacts/contacts-select.https.window.js b/tests/wpt/web-platform-tests/contacts/contacts-select.https.window.js
index c93d711ed52..850217aadfa 100644
--- a/tests/wpt/web-platform-tests/contacts/contacts-select.https.window.js
+++ b/tests/wpt/web-platform-tests/contacts/contacts-select.https.window.js
@@ -1,3 +1,4 @@
+// META: script=/resources/test-only-api.js
 // META: script=/resources/testdriver.js
 // META: script=/resources/testdriver-vendor.js
 // META: script=resources/helpers.js
diff --git a/tests/wpt/web-platform-tests/contacts/resources/helpers.js b/tests/wpt/web-platform-tests/contacts/resources/helpers.js
index 88b2f1656ee..c67d6846528 100644
--- a/tests/wpt/web-platform-tests/contacts/resources/helpers.js
+++ b/tests/wpt/web-platform-tests/contacts/resources/helpers.js
@@ -8,31 +8,16 @@
 // these tests the browser must be run with these options:
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
-const loadChromiumResources = async () => {
-  if (!window.MojoInterfaceInterceptor) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
+async function loadChromiumResources() {
 
-  const resources = [
-    '/gen/layout_test_data/mojo/public/js/mojo_bindings.js',
+  const chromiumResources = [
     '/gen/third_party/blink/public/mojom/contacts/contacts_manager.mojom.js',
-    '/resources/chromium/contacts_manager_mock.js',
+    '/gen/components/payments/mojom/payment_request_data.mojom.js',
   ];
 
-  await Promise.all(resources.map(path => {
-    const script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    const promise = new Promise((resolve, reject) => {
-      script.onload = resolve;
-      script.onerror = reject;
-    });
-    document.head.appendChild(script);
-    return promise;
-  }));
-};
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/chromium/contacts_manager_mock.js');
+}
 
 // User Agents must provide their own implementation of `WebContacts`,
 // which must contain the following this interface:
@@ -42,12 +27,11 @@ const loadChromiumResources = async () => {
 // }
 async function createWebContactsTest() {
   if (typeof WebContactsTest === 'undefined') {
-    await loadChromiumResources();
+    if (isChromiumBased) {
+      await loadChromiumResources();
+    }
   }
-  assert_true(
-    typeof WebContactsTest !== 'undefined',
-    'Mojo testing interface is not available.'
-  );
+  assert_implements(WebContactsTest, 'WebContactsTest is unavailable.');
   return new WebContactsTest();
 }
 
diff --git a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html b/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html
index 28f7eaab0a0..a275096ce2e 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html
@@ -41,15 +41,49 @@
         "required_csp": "frame-src http://c.com:443 http://b.com", 
         "returned_csp": "frame-src http://b.com:80 http://c.com:443", 
         "expected": IframeLoad.EXPECT_LOAD },
+      { "name": "Host wildcard *.a.com does not match a.com",
+        "required_csp": "frame-src http://*.a.com",
+        "returned_csp": "frame-src http://a.com",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name": "Host intersection with wildcards is computed correctly.",
+        "required_csp": "frame-sr 'none'",
+        "returned_csp": "frame-src http://a.com",
+        "returned_csp_2": "frame-src http://*.a.com",
+        "expected": IframeLoad.EXPECT_LOAD },
       { "name": "Iframe should load even if the ports are different but are default for the protocols.", 
         "required_csp": "frame-src http://b.com:80", 
         "returned_csp": "child-src https://b.com:443", 
         "expected": IframeLoad.EXPECT_LOAD },
+      { "name": "Iframe should block if intersection allows sources which are not in required_csp.",
+        "required_csp": "style-src http://*.example.com:*",
+        "returned_csp": "style-src http://*.com:*",
+        "returned_csp_2": "style-src http://*.com http://*.example.com:*",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name": "Iframe should block if intersection allows sources which are not in required_csp (other ordering).",
+        "required_csp": "style-src http://*.example.com:*",
+        "returned_csp": "style-src http://*.com:*",
+        "returned_csp_2": "style-src http://*.example.com:* http://*.com",
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name": "Iframe should load if intersection allows only sources which are in required_csp.",
+        "required_csp": "style-src http://*.example.com",
+        "returned_csp": "style-src http://*.example.com:*",
+        "returned_csp_2": "style-src http://*.com",
+        "expected": IframeLoad.EXPECT_LOAD },
+      { "name": "Iframe should block if plugin-types directive is not subsumed.",
+        "required_csp": "plugin-types application/pdf",
+        "returned_csp": null,
+        "expected": IframeLoad.EXPECT_BLOCK },
+      { "name": "Iframe should load if plugin-types directive is subsumed.",
+        "required_csp": "plugin-types application/pdf application/x-java-applet",
+        "returned_csp": "plugin-types application/pdf",
+        "expected": IframeLoad.EXPECT_LOAD },
     ];
 
     tests.forEach(test => {
       async_test(t =>  {
         var url = generateUrlWithPolicies(Host.CROSS_ORIGIN, test.returned_csp);
+        if (test.returned_csp_2)
+          url.searchParams.append("policy2", test.returned_csp_2);
         assert_iframe_with_csp(t, url, test.required_csp, test.expected, test.name, null);
       }, test.name);
     });
diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html
index 28129184bda..f4122f3d356 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document-meta.sub.html
@@ -3,7 +3,7 @@
 <html>
 <body></body>
 <script>
-    async_test(async test => {
+    promise_test(async test => {
       // 1. Load an iframe (not blocked).
       let iframe = document.createElement("iframe");
       {
@@ -47,8 +47,6 @@
       // 5. Regression test for https://crbug.com/1018385. The browser should
       // not crash while displaying the error page.
       await new Promise(resolve => window.setTimeout(resolve, 1000));
-
-      test.done();
     }, "Same-document navigations in an iframe blocked by CSP frame-src dynamically using the <meta> tag");
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html
index eeda05bb43b..9868f929558 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/frame-src/frame-src-same-document.sub.html
@@ -4,10 +4,9 @@
 <body></body>
 <script>
     let crossOriginUrl =
-      "http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/support/frame.html";
+      "http://www1.{{host}}:{{ports[http][0]}}/content-security-policy/frame-src/support/frame.html";
 
-    async_test(async test => {
-      test.done();
+    promise_test(async test => {
       let iframe = document.createElement("iframe");
       document.body.appendChild(iframe);
 
@@ -18,8 +17,6 @@
         iframe.src = crossOriginUrl + hash;
         await violation;
       }
-
-      test.done();
     }, "Same-document navigation in an iframe blocked by CSP frame-src");
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.js
index cf22e46a194..9e153d03aae 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_multiple.tentative.https.any.js
@@ -39,9 +39,7 @@ promise_test(async testCase => {
   }
 
   {
-    const subscriptions = [
-      { name: 'cookie-name1', matchType: 'equals', url: `${scope}/path1` },
-    ];
+    const subscriptions = [{ name: 'cookie-name1', url: `${scope}/path1` }];
     await registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => {
       // For non-ServiceWorker environments, registration.unregister() cleans up
@@ -54,7 +52,7 @@ promise_test(async testCase => {
   {
     const subscriptions = [
       { },  // Test the default values for subscription properties.
-      { name: 'cookie-prefix', matchType: 'starts-with' },
+      { name: 'cookie-prefix' },
     ];
     await registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => {
@@ -72,11 +70,8 @@ promise_test(async testCase => {
   subscriptions.sort((a, b) => CompareStrings(`${a.name}`, `${b.name}`));
 
   assert_equals(subscriptions[0].name, 'cookie-name1');
-  assert_equals('equals', subscriptions[0].matchType);
 
   assert_equals(subscriptions[1].name, 'cookie-prefix');
-  assert_equals('starts-with', subscriptions[1].matchType);
 
   assert_false('name' in subscriptions[2]);
-  assert_equals('starts-with', subscriptions[2].matchType);
 }, 'getSubscriptions returns a subscription passed to subscribe');
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_single.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_single.tentative.https.any.js
index fac0f408e06..98ec19df3f1 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_single.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStoreManager_getSubscriptions_single.tentative.https.any.js
@@ -30,9 +30,7 @@ promise_test(async testCase => {
   }
 
   {
-    const subscriptions = [
-      { name: 'cookie-name', matchType: 'equals', url: `${scope}/path` }
-    ];
+    const subscriptions = [{ name: 'cookie-name', url: `${scope}/path` }];
     await registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => {
       // For non-ServiceWorker environments, registration.unregister() cleans up
@@ -47,7 +45,6 @@ promise_test(async testCase => {
   assert_equals(subscriptions.length, 1);
 
   assert_equals(subscriptions[0].name, 'cookie-name');
-  assert_equals(subscriptions[0].matchType, 'equals');
   assert_equals(subscriptions[0].url,
                 (new URL(`${scope}/path`, self.location.href)).href);
 }, 'getSubscriptions returns a subscription passed to subscribe');
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.https.window.js
index 5f20947dbf1..9812a046bc6 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_basic.tentative.https.window.js
@@ -12,6 +12,10 @@ promise_test(async testCase => {
 
   const event = await eventPromise;
   assert_true(event instanceof CookieChangeEvent);
+
+  assert_true(event.changed === event.changed);
+  assert_true(event.deleted === event.deleted);
+
   assert_equals(event.type, 'change');
   assert_equals(event.changed.length, 1);
   assert_equals(event.changed[0].name, 'cookie-name');
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js
index ab88ec30804..5055a42e5d3 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js
@@ -22,6 +22,25 @@ promise_test(async testCase => {
   assert_equals(cookies[1].value, 'cookie-value-2');
 }, 'cookieStore.getAll with no arguments');
 
+promise_test(async testCase => {
+  await cookieStore.set('cookie-name', 'cookie-value');
+  testCase.add_cleanup(async () => {
+    await cookieStore.delete('cookie-name');
+  });
+  await cookieStore.set('cookie-name-2', 'cookie-value-2');
+  testCase.add_cleanup(async () => {
+    await cookieStore.delete('cookie-name-2');
+  });
+
+  const cookies = await cookieStore.getAll({});
+  cookies.sort((a, b) => a.name.localeCompare(b.name));
+  assert_equals(cookies.length, 2);
+  assert_equals(cookies[0].name, 'cookie-name');
+  assert_equals(cookies[0].value, 'cookie-value');
+  assert_equals(cookies[1].name, 'cookie-name-2');
+  assert_equals(cookies[1].value, 'cookie-value-2');
+}, 'cookieStore.getAll with empty options');
+
 promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
   testCase.add_cleanup(async () => {
@@ -71,78 +90,6 @@ promise_test(async testCase => {
   assert_equals(cookies[0].value, 'cookie-value');
 }, 'cookieStore.getAll with name in both positional arguments and options');
 
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookies = await cookieStore.getAll({ name: 'cookie-name',
-                                             matchType: 'equals' });
-  assert_equals(cookies.length, 1);
-  assert_equals(cookies[0].name, 'cookie-name');
-  assert_equals(cookies[0].value, 'cookie-value');
-
-  const no_cookies = await cookieStore.getAll(
-      'cookie-na', { matchType: 'equals' });
-  assert_equals(no_cookies.length, 0);
-}, 'cookieStore.getAll with matchType explicitly set to equals');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-  await cookieStore.set('cookie-name-2', 'cookie-value-2');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name-2');
-  });
-
-  const cookies = await cookieStore.getAll({ name: 'cookie-name-',
-                                             matchType: 'starts-with' });
-  assert_equals(cookies.length, 1);
-  assert_equals(cookies[0].name, 'cookie-name-2');
-  assert_equals(cookies[0].value, 'cookie-value-2');
-}, 'cookieStore.getAll with matchType set to starts-with');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-  await cookieStore.set('cookie-name-2', 'cookie-value-2');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name-2');
-  });
-
-  await promise_rejects_js(testCase, TypeError, cookieStore.getAll(
-      { name: 'cookie-name', matchType: 'invalid' }));
-}, 'cookieStore.getAll with invalid matchType');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookies = await cookieStore.getAll({ matchType: 'equals' });
-  assert_equals(cookies.length, 1);
-  assert_equals(cookies[0].name, 'cookie-name');
-  assert_equals(cookies[0].value, 'cookie-value');
-}, 'cookieStore.getAll with matchType set to equals and missing name');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookies = await cookieStore.getAll({ matchType: 'starts-with' });
-  assert_equals(cookies.length, 1);
-  assert_equals(cookies[0].name, 'cookie-name');
-  assert_equals(cookies[0].value, 'cookie-value');
-}, 'cookieStore.getAll with matchType set to starts-with and missing name');
-
 promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
   testCase.add_cleanup(async () => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js
index 4cf596bbec2..a56032f03e2 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js
@@ -9,25 +9,17 @@ promise_test(async testCase => {
     await cookieStore.delete('cookie-name');
   });
 
-  const cookie = await cookieStore.get();
-  assert_equals(cookie.name, 'cookie-name');
-  assert_equals(cookie.value, 'cookie-value');
-}, 'cookieStore.get with no arguments');
+  await promise_rejects_js(testCase, TypeError, cookieStore.get());
+}, 'cookieStore.get with no arguments returns TypeError');
 
 promise_test(async testCase => {
-  await cookieStore.set('cookie-name-1', 'cookie-value-1');
+  await cookieStore.set('cookie-name', 'cookie-value');
   testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name-1');
-  });
-  await cookieStore.set('cookie-name-2', 'cookie-value-2');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name-2');
+    await cookieStore.delete('cookie-name');
   });
 
-  const cookie = await cookieStore.get();
-  assert_equals(cookie.name, 'cookie-name-1');
-  assert_equals(cookie.value, 'cookie-value-1');
-},'cookieStore.get with no args and multiple matches');
+  await promise_rejects_js(testCase, TypeError, cookieStore.get({}));
+},'cookieStore.get with empty options returns TypeError');
 
 promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
@@ -63,66 +55,6 @@ promise_test(async testCase => {
   assert_equals(cookie.value, 'cookie-value');
 }, 'cookieStore.get with name in both positional arguments and options');
 
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookie = await cookieStore.get(
-      'cookie-name', { matchType: 'equals' });
-  assert_equals(cookie.name, 'cookie-name');
-  assert_equals(cookie.value, 'cookie-value');
-
-  const no_cookie = await cookieStore.get({ name: 'cookie-na',
-                                            matchType: 'equals' });
-  assert_equals(no_cookie, null);
-}, 'cookieStore.get with matchType explicitly set to equals');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookie = await cookieStore.get({ name: 'cookie-na',
-                                         matchType: 'starts-with' });
-  assert_equals(cookie.name, 'cookie-name');
-  assert_equals(cookie.value, 'cookie-value');
-}, 'cookieStore.get with matchType set to starts-with');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  await promise_rejects_js(testCase, TypeError, cookieStore.get(
-      { name: 'cookie-name', matchType: 'invalid' }));
-}, 'cookieStore.get with invalid matchType');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookie = await cookieStore.get({ matchType: 'equals' });
-  assert_equals(cookie.name, 'cookie-name');
-  assert_equals(cookie.value, 'cookie-value');
-}, 'cookieStore.get with matchType set to equals and missing name');
-
-promise_test(async testCase => {
-  await cookieStore.set('cookie-name', 'cookie-value');
-  testCase.add_cleanup(async () => {
-    await cookieStore.delete('cookie-name');
-  });
-
-  const cookie = await cookieStore.get({ matchType: 'starts-with' });
-  assert_equals(cookie.name, 'cookie-name');
-  assert_equals(cookie.value, 'cookie-value');
-}, 'cookieStore.get with matchType set to starts-with and missing name');
-
 promise_test(async testCase => {
   await cookieStore.set('cookie-name', 'cookie-value');
   testCase.add_cleanup(async () => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js
index 6c744533321..9337669afd5 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js
@@ -9,6 +9,6 @@ promise_test(async testCase => {
      await cookieStore.delete('cookie-name');
   });
   await cookieStore.delete('cookie-name');
-  const cookie = await cookieStore.get();
+  const cookie = await cookieStore.get('cookie-name');
   assert_equals(cookie, null);
 }, 'cookieStore.get returns null for a cookie deleted by cookieStore.delete');
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_opaque_origin.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/cookieStore_opaque_origin.tentative.https.html
index bbf0dbd9864..94a13fe63f9 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_opaque_origin.tentative.https.html
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_opaque_origin.tentative.https.html
@@ -7,7 +7,7 @@
 <script>
 
 const apiCalls = {
-  'get': 'cookieStore.get()',
+  'get': 'cookieStore.get("cookie-name")',
   'getAll': 'cookieStore.getAll()',
   'set': 'cookieStore.set("cookie-name", "cookie-value")',
   'delete': 'cookieStore.delete("cookie-name")'
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_subscribe_arguments.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_subscribe_arguments.tentative.https.any.js
index c86ea871645..ca5f55d645b 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_subscribe_arguments.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_subscribe_arguments.tentative.https.any.js
@@ -25,9 +25,7 @@ promise_test(async testCase => {
   }
 
   {
-    const subscriptions = [
-      { name: 'cookie-name', matchType: 'equals' }
-    ];
+    const subscriptions = [{ name: 'cookie-name' }];
     await self.registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
   }
@@ -36,7 +34,6 @@ promise_test(async testCase => {
   assert_equals(subscriptions.length, 1);
 
   assert_equals(subscriptions[0].name, 'cookie-name');
-  assert_equals(subscriptions[0].matchType, 'equals');
   assert_equals(subscriptions[0].url, registration.scope);
 }, 'cookieStore.subscribe without url in option');
 
@@ -62,7 +59,7 @@ promise_test(async testCase => {
 
   await promise_rejects_js(testCase, TypeError,
       registration.cookies.subscribe(
-          { name: 'cookie-name', matchType: 'equals', url: '/wrong/path' }));
+          { name: 'cookie-name', url: '/wrong/path' }));
 }, 'cookieStore.subscribe with invalid url path in option');
 
 promise_test(async testCase => {
@@ -86,9 +83,7 @@ promise_test(async testCase => {
   }
 
   {
-    const subscriptions = [
-      { name: 'cookie-name', matchType: 'equals' }
-    ];
+    const subscriptions = [{ name: 'cookie-name' }];
     // Call subscribe for same subscription multiple times to verify that it is
     // idempotent.
     await self.registration.cookies.subscribe(subscriptions);
@@ -101,7 +96,6 @@ promise_test(async testCase => {
   assert_equals(subscriptions.length, 1);
 
   assert_equals(subscriptions[0].name, 'cookie-name');
-  assert_equals(subscriptions[0].matchType, 'equals');
   assert_equals(subscriptions[0].url, registration.scope);
 }, 'cookieStore.subscribe is idempotent');
 
@@ -127,8 +121,8 @@ promise_test(async testCase => {
 
   {
     const subscriptions = [
-      { name: 'cookie-name1', matchType: 'equals' },
-      { name: 'cookie-name2', matchType: 'equals' }
+      { name: 'cookie-name1' },
+      { name: 'cookie-name2' },
     ];
     await self.registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
@@ -144,6 +138,5 @@ promise_test(async testCase => {
   assert_equals(subscriptions.length, 1);
 
   assert_equals(subscriptions[0].name, 'cookie-name2');
-  assert_equals(subscriptions[0].matchType, 'equals');
   assert_equals(subscriptions[0].url, registration.scope);
 }, 'CookieStore.unsubscribe is idempotent');
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/helper_iframe.sub.html b/tests/wpt/web-platform-tests/cookie-store/resources/helper_iframe.sub.html
index 8e91cb7bed4..9017eace44d 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/helper_iframe.sub.html
+++ b/tests/wpt/web-platform-tests/cookie-store/resources/helper_iframe.sub.html
@@ -10,7 +10,7 @@
   //
   // Read a cookie.
   //   Command: { existingCookieName: 'cookie-name' }
-  //   Response: Result of cookieStore.get():
+  //   Response: Result of cookieStore.get('cookie-name'):
   //     { frameCookie: { name: 'cookie-name', value: 'cookie-value' } }
   window.addEventListener('message', async function (event) {
     const { opname } = event.data;
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.tentative.https.html
index bff1f04bad0..a1124e92201 100644
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.tentative.https.html
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_reset.tentative.https.html
@@ -16,7 +16,7 @@ promise_test(async t => {
   t.add_cleanup(() => registration.unregister());
   await wait_for_state(t, registration.installing, 'activated');
   await registration.cookies.subscribe(
-      [{ name: 'cookie-name', matchType: 'equals' }]);
+      [{ name: 'cookie-name' }]);
   const original_subscriptions = await registration.cookies.getSubscriptions();
   assert_equals(original_subscriptions.length, 1,
                 'subscription count before unregistration');
@@ -39,7 +39,7 @@ promise_test(async t => {
   t.add_cleanup(() => registration.unregister());
   await wait_for_state(t, registration.installing, 'activated');
   await registration.cookies.subscribe(
-      [{ name: 'cookie-name', matchType: 'equals' }]);
+      [{ name: 'cookie-name' }]);
   const original_subscriptions = await registration.cookies.getSubscriptions();
   assert_equals(original_subscriptions.length, 1,
                 'subscription count before update');
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.tentative.https.any.js
index b1e412c7997..30d8d70940d 100644
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_mismatched_subscription.tentative.https.any.js
@@ -20,9 +20,7 @@ const kCookieChangeReceivedPromise = new Promise((resolve) => {
 promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
 
-  const subscriptions = [
-    { name: 'cookie-name', matchType: 'equals', url: `${kScope}/path` },
-  ];
+  const subscriptions = [{ name: 'cookie-name', url: `${kScope}/path` }];
   await registration.cookies.subscribe(subscriptions);
   testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
 
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.tentative.https.any.js
index f983f54b44a..cd0657c0bcd 100644
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_multiple_subscriptions.tentative.https.any.js
@@ -34,16 +34,14 @@ promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
 
   {
-    const subscriptions = [
-      { name: 'cookie-name1', matchType: 'equals', url: `${kScope}/path1` },
-    ];
+    const subscriptions = [{ name: 'cookie-name1', url: `${kScope}/path1` }];
     await registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
   }
   {
     const subscriptions = [
       { },  // Test the default values for subscription properties.
-      { name: 'cookie-prefix', matchType: 'starts-with' },
+      { name: 'cookie-name2' },
     ];
     await registration.cookies.subscribe(subscriptions);
     testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.tentative.https.any.js
index b4089030e6b..1f433aeb947 100644
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_overlapping_subscriptions.tentative.https.any.js
@@ -35,8 +35,8 @@ promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
 
   const subscriptions = [
-    { name: 'coo', matchType: 'starts-with' },
-    { name: 'cookie', matchType: 'starts-with' },
+    { name: 'cookie-name' },
+    { url: `${kScope}/path` }
   ];
   await registration.cookies.subscribe(subscriptions);
   testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.js
index b38d91a3c65..3ccb4b303d9 100644
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookiechange_eventhandler_single_subscription.tentative.https.any.js
@@ -18,9 +18,7 @@ const kCookieChangeReceivedPromise = new Promise(resolve => {
 promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
 
-  const subscriptions = [
-    { name: 'cookie-name', matchType: 'equals', url: `${kScope}/path` },
-  ];
+  const subscriptions = [{ name: 'cookie-name', url: `${kScope}/path` }];
   await registration.cookies.subscribe(subscriptions);
   testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
 
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.tentative.https.any.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.tentative.https.any.js
index 1921583e5c5..8def2440897 100644
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_oncookiechange_eventhandler_single_subscription.tentative.https.any.js
@@ -18,9 +18,7 @@ const kCookieChangeReceivedPromise = new Promise(resolve => {
 promise_test(async testCase => {
   await kServiceWorkerActivatedPromise;
 
-  const subscriptions = [
-    { name: 'cookie-name', matchType: 'equals', url: `${kScope}/path` }
-  ];
+  const subscriptions = [{ name: 'cookie-name', url: `${kScope}/path` }];
   await registration.cookies.subscribe(subscriptions);
   testCase.add_cleanup(() => registration.cookies.unsubscribe(subscriptions));
 
diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001-ref.xht
index 587b8441fa3..c67c2bc4d83 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/positioning/bottom-offset-001-ref.xht
@@ -9,8 +9,6 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
 
   <style type="text/css"><![CDATA[
-  div#inline-block {display: inline-block;}
-
   img {vertical-align: top;}
   ]]></style>
 
@@ -20,7 +18,7 @@
 
   <p>Test passes if there is a blue square with its bottom-left corner missing.</p>
 
-  <div id="inline-block">
+  <div>
   		<div><img src="support/blue15x15.png" width="48" height="48" alt="Image download support must be enabled" /><img src="support/blue15x15.png" width="48" height="48" alt="Image download support must be enabled" /></div>
   		<div><img src="support/1x1-white.png" width="48" height="48" alt="Image download support must be enabled" /><img src="support/blue15x15.png" width="48" height="48" alt="Image download support must be enabled" /></div>
   </div>
diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html b/tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html
index e74181e2c35..543586f0983 100644
--- a/tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html
+++ b/tests/wpt/web-platform-tests/css/compositing/svg/mix-blend-mode-svg-rectangle.html
@@ -12,7 +12,9 @@
 		<link rel="match" href="reference/mix-blend-mode-svg-rectangle-ref.html">
 	</head>
 	<body>
-		<p>There should be no red rectangle on the screen. <br>
+		<!-- The white background is to prevent alpha-blending differences in Chrome
+		     for the antialiased pixels of the text. -->
+		<p style="background: white">There should be no red rectangle on the screen. <br>
 		   Test passes if you see a black rectangle.</p>
 		<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="400px" height="400px" >
 			<rect x="0" y="0" width="100" height="100" fill="aqua"/>
diff --git a/tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html b/tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html
index 6d74ee05211..94e73b57c97 100644
--- a/tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html
+++ b/tests/wpt/web-platform-tests/css/compositing/svg/reference/mix-blend-mode-svg-rectangle-ref.html
@@ -5,6 +5,9 @@
 		<title>CSS Reftest Reference</title>
 		<link rel="author" title="Mirela Budăeș" href="mailto:mbudaes@adobe.com">
 		<style>
+		p {
+			background: white;
+		}
 		div {
 			width: 100px;
 			height:100px;
diff --git a/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html b/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html
index d54031c2f4a..3e577d6ea6c 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/event-dispatch.tentative.html
@@ -91,6 +91,19 @@ promise_test(async t => {
   assert_equals(evt.elapsedTime, 0.0);
 }, 'Active -> Idle, display: none');
 
+promise_test(async t => {
+  const { animation, watcher, div } = setupAnimation(t, 'anim 100s paused');
+
+  // Seek to After phase.
+  animation.finish();
+  await watcher.wait_for(['animationstart', 'animationend']);
+
+  div.style.display = 'none';
+
+  // Wait a couple of frames and check that no event was dispatched.
+  await waitForAnimationFrames(2);
+}, 'After -> Idle, display: none');
+
 promise_test(async t => {
   const { animation, watcher } = setupAnimation(t, 'anim 100s');
 
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012-ref.html
new file mode 100644
index 00000000000..75f7985aa4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .spacer { display:inline-block; width:20px; }
+</style>
+<p>There should be two good-looking arcs below.</p>
+<div style="font-size:40px; line-height:100px;">
+  <span style="border:20px solid; border-radius:40px; border-right:none; border-top-right-radius:0; border-bottom-right-radius:0;">
+    <span class="spacer"></span></span>
+  <br>
+  <span style="border:20px solid; border-radius:40px; border-left:none; border-top-left-radius:0; border-bottom-left-radius:0;">
+    <span class="spacer"></span></span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012.html
new file mode 100644
index 00000000000..e3b97e2ea7b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-radius-012.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#the-border-radius">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1119323">
+<link rel="match" href="border-radius-012-ref.html">
+<style>
+  .spacer { display:inline-block; width:20px; }
+</style>
+<p>There should be two good-looking arcs below.</p>
+<div style="font-size:40px; line-height:100px;">
+  <span style="border:20px solid; border-radius:40px;">
+    <span class="spacer"></span><br><span class="spacer"></span>
+  </span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-a.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-a.html
new file mode 100644
index 00000000000..d5354a35854
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-a.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Test: border-width small values</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-width">
+<link rel="mismatch" href="reference/border-width-small-values-001-ref.html">
+<meta name="assert" content="Tese tests check that small values for border-width (greater than 0px and lower than 1px) are visible.">
+<div style="border: 0.1px solid black;">The test passes if this text has a border</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-b.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-b.html
new file mode 100644
index 00000000000..ccb5004a64f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-b.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Test: border-width small values</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-width">
+<link rel="mismatch" href="reference/border-width-small-values-001-ref.html">
+<meta name="assert" content="Tese tests check that small values for border-width (greater than 0px and lower than 1px) are visible.">
+<div style="border: 0.25px solid black;">The test passes if this text has a border</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-c.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-c.html
new file mode 100644
index 00000000000..43651fe2312
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-c.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Test: border-width small values</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-width">
+<link rel="mismatch" href="reference/border-width-small-values-001-ref.html">
+<meta name="assert" content="Tese tests check that small values for border-width (greater than 0px and lower than 1px) are visible.">
+<div style="border: 0.5px solid black;">The test passes if this text has a border</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-d.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-d.html
new file mode 100644
index 00000000000..11ff8b5c555
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-d.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Test: border-width small values</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-width">
+<link rel="mismatch" href="reference/border-width-small-values-001-ref.html">
+<meta name="assert" content="Tese tests check that small values for border-width (greater than 0px and lower than 1px) are visible.">
+<div style="border: 0.7px solid black;">The test passes if this text has a border</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-e.html b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-e.html
new file mode 100644
index 00000000000..5fc44349834
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/border-width-small-values-001-e.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Test: border-width small values</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-width">
+<link rel="mismatch" href="reference/border-width-small-values-001-ref.html">
+<meta name="assert" content="Tese tests check that small values for border-width (greater than 0px and lower than 1px) are visible.">
+<div style="border: 0.9px solid black;">The test passes if this text has a border</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-repeat.html b/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-repeat.html
index 001e52a003c..1b8e7588d26 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-repeat.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-repeat.html
@@ -1,27 +1,26 @@
 <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>CSS Border Test:border image repeat property with value repeat</title>
-    <link rel="author" title="yanshasha" href="mailto:yanshasha133@gmail.com" />
-    <link rel="reviewer" title="Dayang Shen" href="mailto:shendayang@baidu.com" /> <!-- 2013-08-26 -->
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-repeat" />
-    <link rel="match" href="reference/css3-border-image-repeat-repeat-ref.html" />
-    <style type="text/css">
+
+    <meta charset="UTF-8">
+    <title>CSS Border Test: border image repeat property with value repeat</title>
+    <link rel="author" title="yanshasha" href="mailto:yanshasha133@gmail.com">
+    <link rel="reviewer" title="Dayang Shen" href="mailto:shendayang@baidu.com"> <!-- 2013-08-26 -->
+    <!--
+    corrected and improved to be more precise, rigorous and much more challenging
+    by Gérard Talbot 2020-08-24
+    -->
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-image-repeat">
+    <link rel="match" href="reference/css3-border-image-repeat-repeat-ref.html">
+    <style>
             div {
-                width: 100px;
-                height: 100px;
-                border: solid 26px blue;
-                border-image-source: url(support/border.png);
-                border-image-slice: 26;
+                border: red solid 18px;
                 border-image-repeat: repeat;
+                border-image-slice: 27;
+                border-image-source: url("support/blue-and-red-diamonds-81x81.png");
+                height: 108px;  /* 6 times 18 == 108 */
+                width: 144px;  /* 8 times 18 == 144 */
             }
     </style>
-  </head>
-  <body>
-    <p>
-      The test passes if the blue diamond is repeating between the red diamonds.
-    </p>
+
+    <p>Test passes if a blue diamond is repeated 8 times horizontally between red diamonds and repeated 6 times vertically between red diamonds. Each of the 4 edges between red diamonds must start and end with a half slice of a blue diamond.
+
     <div></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-stretch.html b/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-stretch.html
index d9e1fc03e6f..c83cf383725 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-stretch.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/css3-border-image-repeat-stretch.html
@@ -1,27 +1,26 @@
 <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>CSS Border Test:border image repeat property with value stretch</title>
-    <link rel="author" title="yanshasha" href="mailto:yanshasha133@gmail.com" />
-    <link rel="reviewer" title="Dayang Shen" href="mailto:shendayang@baidu.com" /> <!-- 2013-08-26 -->
-    <link rel="help" href="http://www.w3.org/TR/css3-background/#border-image-repeat" />
-    <link rel="match" href="reference/css3-border-image-repeat-stretch-ref.html" />
-    <style type="text/css">
+
+    <meta charset="UTF-8">
+    <title>CSS Border Test: border image repeat property with value stretch</title>
+    <link rel="author" title="yanshasha" href="mailto:yanshasha133@gmail.com">
+    <link rel="reviewer" title="Dayang Shen" href="mailto:shendayang@baidu.com"> <!-- 2013-08-26 -->
+    <!--
+    corrected and improved to be more precise
+    by Gérard Talbot 2020-05-27
+    -->
+    <link rel="help" href="http://www.w3.org/TR/css3-background/#the-border-image-repeat">
+    <link rel="match" href="reference/css3-border-image-repeat-stretch-ref.html">
+    <style>
             div {
-                width: 100px;
-                height: 100px;
-                border: solid 26px blue;
-                border-image-source: url(support/border.png);
-                border-image-slice: 26;
+                border: red solid 27px;
                 border-image-repeat: stretch;
+                border-image-source: url("support/blue-and-red-diamonds-81x81.png");
+                border-image-slice: 27;
+                height: 100px;
+                width: 100px;
             }
     </style>
-  </head>
-  <body>
-    <p>
-      The test passes if the blue diamond is stretching between the red diamonds.
-    </p>
+
+    <p>Test passes if a blue diamond is stretched between red diamonds.
+
     <div></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/inline-background-rtl-001.html b/tests/wpt/web-platform-tests/css/css-backgrounds/inline-background-rtl-001.html
new file mode 100644
index 00000000000..a7149e2f3c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/inline-background-rtl-001.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>CSS Backgrounds Test: background to inline boxes in RTL</title>
+<link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#the-background-color">
+<link rel="help" href="https://crbug.com/1123375">
+<link rel="match" href="reference/inline-background-rtl-001-ref.html">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<style>
+.s { background-color: white; }
+.atomic { display: inline-block; }
+</style>
+<body>
+<div dir="rtl">
+<span>
+<span class="s">Hello<br>World<br></span>
+<span class="atomic"></span>
+</span>
+</div>
+
+<div dir="rtl">
+<span dir="ltr">
+<span class="s">Hello<br>World<br></span>
+<span class="atomic"></span>
+</span>
+</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html
new file mode 100644
index 00000000000..26177acb379
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/border-width-small-values-001-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Reference Test: border-width small values</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<div>The test passes if this text has a border</div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html
index 64490d2e5ce..58d48f00750 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-repeat-ref.html
@@ -1,86 +1,53 @@
 <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>CSS Border Test:border image repeat property with value repeat</title>
-    <link rel="author" title="yanshasha" href="mailto:yanshasha133@gmail.com" />
-    <link rel="reviewer" title="Dayang Shen" href="mailto:shendayang@baidu.com"> <!-- 2013-09-03 -->
-    <style type="text/css">
-            .box {
-                width: 152px;
-                height: 152px;
-                position: relative;
-            }
-            .red {
-                width: 26px;
-                height: 26px;
-                position: absolute;
-            }
-            #red1 {
-                top: 0;
-                left: 0;
-            }
-            #red2 {
-                top: 0;
-                right: 0;
-            }
-            #red3 {
-                bottom: 0;
-                right: 0;
-            }
-            #red4 {
-                bottom: 0;
-                left: 0;
-            }
-            .blue {
-                position: absolute;
-                background-image: url(../support/blue-diamond.png);
-                background-repeat: repeat;
-                background-position: center;
-            }
-            #blue1 {
-                top: 0;
-                left: 26px;
-                width: 100px;
-                height: 26px;
-            }
-            #blue2 {
-                top: 26px;
-                right: 0;
-                width: 26px;
-                height: 100px;
-            }
-            #blue3 {
-                bottom: 0;
-                right: 26px;
-                width: 100px;
-                height: 26px;
-            }
-            #blue4 {
-                bottom: 26px;
-                left: 0;
-                width: 26px;
-                height: 100px;
-            }
-    </style>
-  </head>
-  <body>
-    <p>
-      The test passes if the blue diamond is repeating between the red diamonds.
-    </p>
-    <div class="box">
-      <img src="../support/red-diamond.png" alt="left top red diamond" class="red" id="red1"/>
-      <img src="../support/red-diamond.png" alt="right top red diamond" class="red" id="red2" />
-      <img src="../support/red-diamond.png" alt="right bottom red diamond" class="red" id="red3" />
-      <img src="../support/red-diamond.png" alt="left bottom red diamond" class="red" id="red4" />
-      <img src="../support/blue-diamond.png" alt="top blue diamond" class="blue" id="blue1"/>
-      <img src="../support/blue-diamond.png" alt="right blue diamond" class="blue" id="blue2" />
-      <img src="../support/blue-diamond.png" alt="bottom blue diamond" class="blue" id="blue3" />
-      <img src="../support/blue-diamond.png" alt="left blue diamond" class="blue" id="blue4" />
-      <div class="blue" id="blue1"></div>
-      <div class="blue" id="blue2"></div>
-      <div class="blue" id="blue3"></div>
-      <div class="blue" id="blue4"></div>
-    </div>
-  </body>
-</html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  table
+    {
+    border-spacing: 0px;
+    table-layout: fixed;
+    }
+
+  td
+    {
+      height: 18px;
+      padding: 0px;
+    }
+
+  td.corner
+    {
+      background-image: url("../support/new-red-diamond-27x27.png");
+      background-size: cover;
+    }
+
+  td#first-row-second-cell , td#third-row-second-cell , td.second-row
+    {
+      background-image: url("../support/blue-diamond-27x27.png");
+      background-size: contain;
+      background-position: center;
+    }
+
+  td.second-row
+    {
+      height: 108px; /* 6 times 18 == 108 */
+    }
+  </style>
+
+  <p>Test passes if a blue diamond is repeated 8 times horizontally between red diamonds and repeated  6 times vertically between red diamonds. Each of the 4 edges between red diamonds must start and end with a half slice of a blue diamond.
+
+  <table>
+
+    <col width="18"><col width="144"><col width="18">
+
+    <tr><td class="corner"><td id="first-row-second-cell"><td class="corner">
+
+    <tr><td class="second-row"><td><td class="second-row">
+
+    <tr><td class="corner"><td id="third-row-second-cell"><td class="corner">
+
+  </table>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html
index cdbffd153b2..ed83c3dbf27 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/css3-border-image-repeat-stretch-ref.html
@@ -1,79 +1,46 @@
 <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>CSS Border Test:border image repeat property with value stretch</title>
-    <link rel="author" title="yanshasha" href="mailto:yanshasha133@gmail.com" />
-    <link rel="reviewer" title="Dayang Shen" href="mailto:shendayang@baidu.com"> <!-- 2013-09-03 -->
-    <style type="text/css">
-            div {
-                width: 152px;
-                height: 152px;
-                position: relative;
-            }
-            .red {
-                width: 26px;
-                height: 26px;
-                position: absolute;
-            }
-            #red1 {
-                top: 0;
-                left: 0;
-            }
-            #red2 {
-                top: 0;
-                right: 0;
-            }
-            #red3 {
-                bottom: 0;
-                right: 0;
-            }
-            #red4 {
-                bottom: 0;
-                left: 0;
-            }
-            .blue {
-                position: absolute;
-            }
-            #blue1 {
-                top: 0;
-                left: 26px;
-                width: 100px;
-                height: 26px;
-            }
-            #blue2 {
-                top: 26px;
-                right: 0;
-                width: 26px;
-                height: 100px;
-            }
-            #blue3 {
-                bottom: 0;
-                right: 26px;
-                width: 100px;
-                height: 26px;
-            }
-            #blue4 {
-                bottom: 26px;
-                left: 0;
-                width: 26px;
-                height: 100px;
-            }
-    </style>
-  </head>
-  <body>
-    <p>
-      The test passes if the blue diamond is stretching between the red diamonds.
-    </p>
-    <div>
-      <img src="../support/red-diamond.png" alt="left top red diamond" class="red" id="red1"/>
-      <img src="../support/red-diamond.png" alt="right top red diamond" class="red" id="red2" />
-      <img src="../support/red-diamond.png" alt="right bottom red diamond" class="red" id="red3" />
-      <img src="../support/red-diamond.png" alt="left bottom red diamond" class="red" id="red4" />
-      <img src="../support/blue-diamond.png" alt="top blue diamond" class="blue" id="blue1"/>
-      <img src="../support/blue-diamond.png" alt="right blue diamond" class="blue" id="blue2" />
-      <img src="../support/blue-diamond.png" alt="bottom blue diamond" class="blue" id="blue3" />
-      <img src="../support/blue-diamond.png" alt="left blue diamond" class="blue" id="blue4" />
-    </div>
-  </body>
-</html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  table
+    {
+    border-spacing: 0px;
+    table-layout: fixed;
+    width: 154px;
+    }
+
+  td
+    {
+      height: 27px;
+      padding: 0px;
+    }
+
+  td.corner
+    {
+      background-image: url("../support/blue-and-red-diamonds-81x81.png");
+    }
+
+  img
+    {
+      vertical-align: top;
+    }
+  </style>
+
+  <p>Test passes if a blue diamond is stretched between red diamonds.
+
+  <table>
+
+    <col width="27"><col width="100"><col width="27">
+
+    <tr><td class="corner"><td><img src="../support/blue-diamond-27x27.png" width="100" height="27" alt="Image download support must be enabled"><td class="corner">
+
+    <tr><td><img src="../support/blue-diamond-27x27.png" width="27" height="100" alt="Image download support must be enabled"><td><td><img src="../support/blue-diamond-27x27.png" width="27" height="100" alt="Image download support must be enabled">
+
+    <tr><td class="corner"><td><img src="../support/blue-diamond-27x27.png" width="100" height="27" alt="Image download support must be enabled"><td class="corner">
+
+  </table>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html
new file mode 100644
index 00000000000..fe2ac8bdb19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/inline-background-rtl-001-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<style>
+.atomic { display: inline-block; }
+</style>
+<body>
+<div dir="rtl">
+<span>
+<span>Hello<br>World<br></span>
+<span class="atomic"></span>
+</span>
+</div>
+
+<div dir="rtl">
+<span dir="ltr">
+<span>Hello<br>World<br></span>
+<span class="atomic"></span>
+</span>
+</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond-27x27.png b/tests/wpt/web-platform-tests/css/css-backgrounds/support/blue-diamond-27x27.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e66726482551231aba9e44557752fd483afa0cd
GIT binary patch
literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|oEa{HEjtmSN`?>!lvI6;RN#5=*
zK$?N!{}soOPe7Wpz$3Dlfq_2}gc(=ZFV6%DvX^-Jy0SlEl@`}FzGu)H02Goeag8W(
z&d<$F%`0JWE=o--Nlj5G&n(GMaQE~L2yf&Q2P!J{ba4#vIKKCqwa@_t4%fi^Z~N1O
zmlPQN^lb4?eLRP$)tx*1{bQbqv;VX|QpgVANs*n!ezNhI!>0xL6JlP-s>oNdt!#Yf
z_-cW+hi(bm%67I6X4$Q#8$-^#oB2=bYyC2Rfm*Xy!SVOge=WOa+%a$6mpeP=b(C|w
WHj??5pKJ+q0E4HipUXO@geCyz1!2Pg

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/support/new-red-diamond-27x27.png b/tests/wpt/web-platform-tests/css/css-backgrounds/support/new-red-diamond-27x27.png
new file mode 100644
index 0000000000000000000000000000000000000000..859cbc33d216aa454ede2702b1c6ac7f39e6ca02
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d<g|oEa{HEjtmSN`?>!lvI6;RN#5=*
zK)Qi}L85HIe;|vqz$3Dlfq_2}gc(=ZFV6%DvX^-Jy0Smv5NG6M|8#pYA5ciL#5JPC
zIX^cyHLrxhxhOTUBsE2$JhLQ2!QIn0AiR-J9H{7wr;B5V$ML<>Hi{lH;Bnc%g;h9(
zLCxbm?<Td<2nC)4OldrqXE4okUUTD`>B>L<c6aN_N=#)6=E~7Dh&<mV%5tZX`vX(j
z&W~$s*SlSq<@n@%R-uNv%->bF7Me8qIGDO^U%tv?>BWgB7nZQdGHq3~DqeEw;>Cr|
zk}O(GTZ2nNC!SJpPi@!Sz!-k)^}+*_PV$s(%lKDmEWqCQ==r1__uQ_Re=~Koa+C5_
zK3!_I%kS^q+A^g}6<Zu)&9`Q=ugnUsSL&5`H77gYWc5<P{fu**8pYZlJ+1=!i^0>?
K&t;ucLK6U`DTR&z

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-000-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-000-ref.html
new file mode 100644
index 00000000000..a7022ae575c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-000-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<p>There should be a yellow box with a hotpink border in the second column.</p>
+<div style="float:left; margin-left:110px; border:10px solid hotpink; width:80px; height:80px; background:yellow;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-000.html b/tests/wpt/web-platform-tests/css/css-break/borders-000.html
new file mode 100644
index 00000000000..7c79f4c0d40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-000.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-000-ref.html">
+<p>There should be a yellow box with a hotpink border in the second column.</p>
+<div style="columns:4; column-gap:10px; column-fill:auto; width:430px; height:100px;">
+  <div style="height:95px;"></div>
+  <div style="border:10px solid hotpink; height:80px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-001-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-001-ref.html
new file mode 100644
index 00000000000..30c472f9378
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-001-ref.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<p>There should be a yellow box that starts in the second column and ends in the
+  third. The top border should be in the second column, and the bottom border
+  should be in the third.</p>
+<div style="float:left; margin-left:110px; border:10px solid hotpink; border-bottom:none; width:80px; height:90px; background:yellow;"></div>
+<div style="float:left; margin-left:10px; border:10px solid hotpink; border-top:none; width:80px; height:10px; background:yellow;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-001.html b/tests/wpt/web-platform-tests/css/css-break/borders-001.html
new file mode 100644
index 00000000000..2fa8c8c96fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-001.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-001-ref.html">
+<p>There should be a yellow box that starts in the second column and ends in the
+  third. The top border should be in the second column, and the bottom border
+  should be in the third.</p>
+<div style="columns:4; column-gap:10px; column-fill:auto; width:430px; height:100px;">
+  <div style="height:95px;"></div>
+  <div style="border:10px solid hotpink; height:100px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-002-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-002-ref.html
new file mode 100644
index 00000000000..7abcf4ed61c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-002-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<p>There should be a yellow box that starts in the second column and ends in the
+  fourth. The top border should be in the second column, and the bottom border
+  should be in the fourth.</p>
+<div style="float:left; margin-left:110px; border:10px solid hotpink; border-bottom:none; width:80px; height:90px; background:yellow;"></div>
+<div style="float:left; margin-left:10px; border:10px solid hotpink; border-bottom:none; border-top:none; width:80px; height:100px; background:yellow;"></div>
+<div style="float:left; margin-left:10px; border:10px solid hotpink; border-top:none; width:80px; height:60px; background:yellow;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-002.html b/tests/wpt/web-platform-tests/css/css-break/borders-002.html
new file mode 100644
index 00000000000..b8bc3a4848b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-002.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-002-ref.html">
+<p>There should be a yellow box that starts in the second column and ends in the
+  fourth. The top border should be in the second column, and the bottom border
+  should be in the fourth.</p>
+<div style="columns:4; column-gap:10px; column-fill:auto; width:430px; height:100px;">
+  <div style="height:95px;"></div>
+  <div style="border:10px solid hotpink; height:250px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-003-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-003-ref.html
new file mode 100644
index 00000000000..d8a576ea6fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-003-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .container {
+      float: left;
+      width: 200px;
+      height: 100px;
+      margin-right: 10px;
+  }
+  .box {
+      border-radius: 15px;
+      border: 20px solid hotpink;
+      background: yellow;
+  }
+  .skip-start {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      border-top: none;
+  }
+  .skip-end {
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+      border-bottom: none;
+  }
+</style>
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The border should be rounded at the start (first column) and at the end
+  (last column).</p>
+<div class="container">
+  <div class="box skip-end" style="height:80px;"></div>
+</div>
+<div class="container">
+  <div class="box skip-start skip-end" style="height:100px;"></div>
+</div>
+<div class="container">
+  <div class="box skip-start" style="height:70px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-003.html b/tests/wpt/web-platform-tests/css/css-break/borders-003.html
new file mode 100644
index 00000000000..f3d9410d0cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-003.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-003-ref.html">
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The border should be rounded at the start (first column) and at the end
+  (last column).</p>
+<div style="columns:3; column-gap:10px; column-fill:auto; width:620px; height:100px;">
+  <div style="border-radius:15px; border:20px solid hotpink; height:250px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-004-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-004-ref.html
new file mode 100644
index 00000000000..8cbbf0ccc45
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-004-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .container {
+      float: left;
+      width: 200px;
+      height: 100px;
+      margin-right: 10px;
+  }
+  .box {
+      border-radius: 40px;
+      border: 20px solid hotpink;
+      background: yellow;
+  }
+  .skip-start {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      border-top: none;
+  }
+  .skip-end {
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+      border-bottom: none;
+  }
+</style>
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The border should be rounded at the start (first column) and at the end
+  (last column).</p>
+<div class="container">
+  <div class="box skip-end" style="height:80px;"></div>
+</div>
+<div class="container">
+  <div class="box skip-start skip-end" style="height:100px;"></div>
+</div>
+<div class="container">
+  <div class="box skip-start" style="height:70px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-004.html b/tests/wpt/web-platform-tests/css/css-break/borders-004.html
new file mode 100644
index 00000000000..5ffca58757e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-004.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-004-ref.html">
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The border should be rounded at the start (first column) and at the end
+  (last column).</p>
+<div style="columns:3; column-gap:10px; column-fill:auto; width:620px; height:100px;">
+  <div style="border-radius:40px; border:20px solid hotpink; height:250px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-005-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-005-ref.html
new file mode 100644
index 00000000000..20a0431510a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-005-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .container {
+      float: left;
+      width: 200px;
+      height: 100px;
+      margin-right: 10px;
+  }
+  .box {
+      border-radius: 80px;
+      border: 20px solid hotpink;
+      background: yellow;
+  }
+  .skip-start {
+      border-top-left-radius: 0;
+      border-top-right-radius: 0;
+      border-top: none;
+  }
+  .skip-end {
+      border-bottom-left-radius: 0;
+      border-bottom-right-radius: 0;
+      border-bottom: none;
+  }
+</style>
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The border should be rounded at the start (first column) and at the end
+  (last column).</p>
+<div class="container">
+  <div class="box skip-end" style="height:80px;"></div>
+</div>
+<div class="container">
+  <div class="box skip-start skip-end" style="height:100px;"></div>
+</div>
+<div class="container">
+  <div class="box skip-start" style="height:70px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-005.html b/tests/wpt/web-platform-tests/css/css-break/borders-005.html
new file mode 100644
index 00000000000..a96c4e42ecc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-005.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-005-ref.html">
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The border should be rounded at the start (first column) and at the end
+  (last column).</p>
+<div style="columns:3; column-gap:10px; column-fill:auto; width:620px; height:100px;">
+  <div style="border-radius:80px; border:20px solid hotpink; height:250px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-006-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-006-ref.html
new file mode 100644
index 00000000000..292c0f9c9b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-006-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .box {
+      height: 80px;
+      margin-bottom: 10px;
+      border: 10px solid hotpink;
+      background: yellow;
+  }
+  .skip-start {
+      border-left: none;
+  }
+  .skip-end {
+      border-right: none;
+  }
+</style>
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The block-start border should be in the first column, and the block-end
+  border should be in the third.</p>
+<div class="box skip-end" style="width:90px;"></div>
+<div class="box skip-start skip-end" style="width:100px;"></div>
+<div class="box skip-start" style="width:60px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-006.html b/tests/wpt/web-platform-tests/css/css-break/borders-006.html
new file mode 100644
index 00000000000..a2c59f7b997
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-006.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-006-ref.html">
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The block-start border should be in the first column, and the block-end
+  border should be in the third.</p>
+<div style="columns:3; column-gap:10px; column-fill:auto; writing-mode:vertical-lr; inline-size:320px; block-size:100px;">
+  <div style="border:10px solid hotpink; block-size:250px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-007-ref.html b/tests/wpt/web-platform-tests/css/css-break/borders-007-ref.html
new file mode 100644
index 00000000000..3b9e23678d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-007-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  .box {
+      height: 80px;
+      margin-bottom: 10px;
+      border: 10px solid hotpink;
+      background: yellow;
+  }
+  .skip-start {
+      border-right: none;
+  }
+  .skip-end {
+      border-left: none;
+  }
+</style>
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The block-start border should be in the first column, and the block-end
+  border should be in the third.</p>
+<div class="box skip-end" style="width:90px;"></div>
+<div class="box skip-start skip-end" style="width:100px;"></div>
+<div class="box skip-start" style="margin-left:30px; width:60px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/borders-007.html b/tests/wpt/web-platform-tests/css/css-break/borders-007.html
new file mode 100644
index 00000000000..d7c5f0568ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/borders-007.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="borders-007-ref.html">
+<p>There should be a yellow box that starts in the first column and ends in the
+  third. The block-start border should be in the first column, and the block-end
+  border should be in the third.</p>
+<div style="columns:3; column-gap:10px; column-fill:auto; writing-mode:vertical-rl; inline-size:320px; block-size:100px;">
+  <div style="border:10px solid hotpink; block-size:250px; background:yellow;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print-ref.html b/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print-ref.html
new file mode 100644
index 00000000000..3459e25edd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Fragmentation Test Reference: Test for pagination of a nested float element in a table in a printing context</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  @page { size:5in 3in; margin:0.5in; }
+
+  html, body {
+    margin: 0;
+  }
+  #target {
+    background: green;
+    width: 2in;
+    height: 6in; /* Expected to cover 3 pages. */
+  }
+  </style>
+
+  <body>
+    <div id="target"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print.html b/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print.html
new file mode 100644
index 00000000000..e4e0a578e9a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/break-nested-float-in-table-001-print.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Fragmentation Test: Test for pagination of a nested float element in a table in a printing context</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-break/#possible-breaks">
+  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1412687">
+  <link rel="match" href="break-nested-float-in-table-001-print-ref.html">
+
+  <style>
+  @page { size:5in 3in; margin:0.5in; }
+
+  html, body {
+    margin: 0;
+  }
+  table {
+    border-spacing: 0;
+  }
+  td {
+    padding: 0;
+  }
+  #target {
+    float: left;
+    background: green;
+    width: 2in;
+    height: 6in; /* Expected to cover 3 pages. */
+  }
+  </style>
+
+  <body>
+    <table>
+      <tr>
+        <td>
+          <div>
+            <!-- target needs to be nested under <td> -->
+            <div id="target"></div>
+          </div>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-002-ref.html b/tests/wpt/web-platform-tests/css/css-break/fieldset-002-ref.html
new file mode 100644
index 00000000000..be5e1b0e7c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/fieldset-002-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="author" title="Ana Sollano Kim" href="mailto:ansollan@microsoft.com">
+<p>There should be a light blue fieldset that starts in the first column and
+  ends in the third. The top border should only be in the first column, and
+  the bottom border should only be in the third.</p>
+<div style="float:left; border:10px solid pink; border-bottom:none; width:140px; height:190px; background:lightblue;"></div>
+<div style="float:left; margin-left:10px; border:10px solid pink; border-top:none; border-bottom:none; width:140px; height:200px; background:lightblue;"></div>
+<div style="float:left; margin-left:10px; border:10px solid pink; border-top:none; width:140px; height:110px; background:lightblue;"></div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-002.html b/tests/wpt/web-platform-tests/css/css-break/fieldset-002.html
new file mode 100644
index 00000000000..aea8cec5d43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/fieldset-002.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<link rel="author" title="Ana Sollano Kim" href="mailto:ansollan@microsoft.com">
+<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="fieldset-002-ref.html">
+<p>There should be a light blue fieldset that starts in the first column and
+  ends in the third. The top border should only be in the first column, and
+  the bottom border should only be in the third.</p>
+<div style="column-count:3; column-fill:auto; column-gap:10px; width:500px; height:200px;">
+  <fieldset style="border:10px solid pink; margin:0; padding:0; height:500px; background:lightblue;"></fieldset>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-003-ref.html b/tests/wpt/web-platform-tests/css/css-break/fieldset-003-ref.html
new file mode 100644
index 00000000000..e8b323dff22
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/fieldset-003-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="author" title="Ana Sollano Kim" href="mailto:ansollan@microsoft.com">
+<p>There should be a light blue fieldset that starts in the first column and
+  ends in the third. Its blue violet legend should only be in the first column,
+  consuming the top border. The bottom border should only be in the third column.
+</p>
+<div style="float:left; border:60px solid pink; border-bottom:none; width:100px; height:0;">
+  <div style="margin-top:-60px; background:lightblue; height:60px"></div>
+  <div style="margin-top:-55px; background:blueviolet; height:50px"></div>
+</div>
+<div style="float:left; margin-left:10px; border:60px solid pink; border-top:none; border-bottom:none; width:100px; height:10px; background:lightblue;"></div>
+<div style="float:left; margin-left:10px; border:60px solid pink; border-top:none; width:100px; height:0; background:lightblue;"></div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-003.html b/tests/wpt/web-platform-tests/css/css-break/fieldset-003.html
new file mode 100644
index 00000000000..6c23a4b93e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/fieldset-003.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Ana Sollano Kim" href="mailto:ansollan@microsoft.com">
+<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="fieldset-003-ref.html">
+<p>There should be a light blue fieldset that starts in the first column and
+  ends in the third. Its blue violet legend should only be in the first column,
+  consuming the top border. The bottom border should only be in the third column.
+</p>
+<div style="column-count:3; column-fill:auto; column-gap:10px; width: 680px; height:40px;">
+  <fieldset style="margin:0; border:60px solid pink; padding:0; width:100px; background:lightblue; height:10px;">
+    <legend style="padding:0; width:100px; height:50px; background:blueviolet;"></legend>
+  </fieldset>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-004-ref.html b/tests/wpt/web-platform-tests/css/css-break/fieldset-004-ref.html
new file mode 100644
index 00000000000..5c96f31a6ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/fieldset-004-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel="author" title="Ana Sollano Kim" href="mailto:ansollan@microsoft.com">
+<p>There should be a light blue fieldset that starts in the first column and
+  ends in the third. Its blue violet legend should only be in the first column,
+  and past the fragmentation line. The bottom border should only be in the third
+  column.
+</p>
+<div style="float:left; margin-top:145px; border:10px solid pink; border-bottom:none; width:140px; height:145px; background:lightblue;">
+  <div style="margin-top:-155px; background:blueviolet; width:50px; height:300px"></div>
+</div>
+<div style="float:left; margin-left:10px; border:10px solid pink; border-top:none; border-bottom:none; width:140px; height:200px; background:lightblue;"></div>
+<div style="float:left; margin-left:10px; border:10px solid pink; border-top:none; width:140px; height:100px; background:lightblue;"></div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-break/fieldset-004.html b/tests/wpt/web-platform-tests/css/css-break/fieldset-004.html
new file mode 100644
index 00000000000..ce832f82985
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/fieldset-004.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="author" title="Ana Sollano Kim" href="mailto:ansollan@microsoft.com">
+<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="fieldset-004-ref.html">
+<p>There should be a light blue fieldset that starts in the first column and
+  ends in the third. Its blue violet legend should only be in the first column,
+  and past the fragmentation line. The bottom border should only be in the third
+  column.
+</p>
+<div style="column-count:3; column-fill:auto; column-gap:10px; width:500px; height:200px;">
+  <fieldset style="border:10px solid pink; margin:0; padding:0; height:590px; background:lightblue;">
+    <legend style="padding:0; margin:0; width:50px; height:300px; background:blueviolet;"></legend>
+  </fieldset>
+</div>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001-ref.html b/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001-ref.html
index ce41e502b74..e2555857834 100644
--- a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001-ref.html
@@ -2,22 +2,11 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>CSS Cascade Green Right Square Reference File</title>
-  <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
-  <style>
-#success {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-  float: right;
-}
-  </style>
+  <title>CSS Cascade: all shorthand Reference File</title>
 </head>
 <body>
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <p>Test passes if the digits are <strong>in order</strong> and there is <strong>no red</strong>.</p>
 
-  <div>
-    <div id="success" class="square green above-right"></div>
-  </div>
+  <div class="test">123 456 789</div>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001.html b/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001.html
index 59b466722f5..2fe110fb278 100644
--- a/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001.html
+++ b/tests/wpt/web-platform-tests/css/css-cascade/all-prop-001.html
@@ -2,43 +2,48 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>CSS Cascade: "all" shorthand property excludes "direction"</title>
+  <title>CSS Cascade: "all" shorthand property excludes "direction" and "unicode-bidi"</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
   <link rel="help" href="http://www.w3.org/TR/css-cascade-3/#all-shorthand">
   <link rel="help" href="http://www.w3.org/TR/css-cascade-4/#all-shorthand">
   <link rel="match" href="all-prop-001-ref.html">
   <meta name="flags" content="">
-  <meta name="assert" content="The 'direction' property should not be included in the properties that the 'all' shorthand is expanded to.">
+  <meta name="assert" content="Test passes if 'all' resets properties other than 'direction' and 'unicode-bidi'.">
   <style>
-.outer {
-  direction: rtl;/* should not get overridden by 'all' */
-  all: initial;/* if incorrectly implemented, this causes direction:initial; which is the same as direction:ltr; */
-  /* need these to trump 'all': */
-  position: relative;
-  display: block;
+.test {
+  /* these must not be overridden */
+  direction: rtl;
+  unicode-bidi: bidi-override;
 }
-.square {
-  width: 100px;
-  height: 100px;
+
+.test, bdo {
+  /* all of these must be overridden */
+  border: solid red;
+  background: red;
+  color: red;
+  text-decoration: line-through;
+  font: bold italic small-caps 20px monospace;
+  outline: solid red;
+  float: left;
+  letter-spacing: 1em;
+  display: list-item;
+  text-align: center;
+  width: 0.5em;
+  margin: 10em;
+  overflow: scroll;
 }
-.green {
-  background-color: green;
-}
-.above-right {
-  position: absolute;
-  right: 0;
-}
-.red {
-  background-color: red;
+
+.test, bdo {
+  all: initial;
+  /* if incorrectly implemented, this causes direction: initial; unicode-bidi: initial;
+     which is the same as direction:ltr; unicode-bidi: normal */
 }
   </style>
 </head>
 <body>
-  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+  <p>Test passes if the digits are <strong>in order</strong> and there is <strong>no red</strong>.</p>
 
-  <div class="outer">
-    <div class="square green above-right"></div>
-    <div class="square red"></div>
-  </div>
+  <div class="test"><bdo dir=rtl>987 <span>654</span></bdo> 321</div>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/import-conditional-001.html b/tests/wpt/web-platform-tests/css/css-cascade/import-conditional-001.html
new file mode 100644
index 00000000000..9bdbbcb5a32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-cascade/import-conditional-001.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Cascade: @import with basic media query</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+  <link rel="help" href="https://www.w3.org/TR/css-cascade-3/#conditional-import">
+  <link rel="help" href="https://www.w3.org/TR/css-cascade-4/#conditional-import">
+  <link rel="help" href="https://www.w3.org/TR/css3-mediaqueries/#syntax">
+  <link rel="match" href="reference/ref-filled-green-100px-square.xht">
+  <meta name="assert" content="Test passes on visual UAs if @import can be combined with a media query.">
+  <style>
+  @import "support/test-red.css";
+  @import "support/test-green.css"
+    (min-width: 1px) and /* assuming screen < 1km */ (max-width: 40000in), nonsense;
+  @import "support/test-red.css"
+    (max-width: 1px), nonsense;
+  div {
+    width: 100px;
+    height: 100px;
+    background: red;
+  }
+  </style>
+</head>
+<body>
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+  <div class="test">FAIL</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-prop.html b/tests/wpt/web-platform-tests/css/css-cascade/important-prop.html
index 5a3dad10897..cf964077165 100644
--- a/tests/wpt/web-platform-tests/css/css-cascade/important-prop.html
+++ b/tests/wpt/web-platform-tests/css/css-cascade/important-prop.html
@@ -2,31 +2,39 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>CSS Cascade: Important</title>
+  <title>CSS Cascade: Important vs. Animations</title>
   <link rel="author" title="David Burns" href="http://www.theautomatedtester.co.uk">
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="https://drafts.csswg.org/css-cascade/#importance">
   <link rel="match" href="important-prop-ref.html">
+  <meta name="assert" content="Test passes if normal rules are overridden by animations, important rules override animations, and !important declarations are ignored in animations.">
   <meta name="flags" content="">
   <style>
-  @keyframes override{
-   from, to{background-color: #f00;}
+  @keyframes override {
+    from, to {
+      background: #f00; color: green;
+      border-color: green; border-color: red !important;
+    }
   }
 
   .square {
     color:#00f;
     animation: override 1s infinite;
-    width: 100px;
-    height: 100px;
+    width: 80px;
+    height: 80px;
+    border: 10px solid red;
+    text-align: center;
   }
-  .green {
+  div {
     background-color:green !important;
+    color: red;
   }
   </style>
 </head>
 <body>
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-  <div class="square green"></div>
+  <div class="square green">FAIL</div>
 
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/important-transition-manual.html b/tests/wpt/web-platform-tests/css/css-cascade/important-transition-manual.html
new file mode 100644
index 00000000000..b9abed469f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-cascade/important-transition-manual.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Cascade: Author !important vs. Transitions</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
+  <link rel="help" href="https://www.w3.org/TR/css-cascade-3/#cascade-sort">
+  <style>
+  .container { padding: 1em 0; border-style: dotted none; border-width: 1px; }
+  .container > div { width: 5em; text-align: center; border: solid; transition: all 3s; }
+
+  .container   > .ref  { border-color: blue ;           color: navy   ;           background: aqua ;           margin:   0.25em ;           }
+  :hover       > .ref  { border-color: aqua ;           color: orange ;           background: teal ;           margin-left: 40% ;           }
+
+  :not(:hover) > .test { border-color: blue !important; color: navy   !important; background: aqua ;                                        }
+  div          > .test {                                                                                       margin:   0.25em !important; }
+  :hover       > .test { border-color: aqua !important; color: orange ;           background: teal !important; margin-left: 40% !important; }
+  </style>
+
+<p>Test passes if the two boxes transition identically when hovering with a mouse below.
+
+<div class=container>
+  <div class=test>Box 1</div>
+  <div class=ref>Box 2</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/support/test-green.css b/tests/wpt/web-platform-tests/css/css-cascade/support/test-green.css
new file mode 100644
index 00000000000..da8e1014d2a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-cascade/support/test-green.css
@@ -0,0 +1,4 @@
+.test {
+  background: green;
+  color: green;
+}
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/support/test-red.css b/tests/wpt/web-platform-tests/css/css-cascade/support/test-red.css
new file mode 100644
index 00000000000..bb309fcd570
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-cascade/support/test-red.css
@@ -0,0 +1,4 @@
+.test {
+  background: red;
+  color: red;
+}
diff --git a/tests/wpt/web-platform-tests/css/css-cascade/unset-val-001.html b/tests/wpt/web-platform-tests/css/css-cascade/unset-val-001.html
index c25b980a3b5..a3d60947b22 100644
--- a/tests/wpt/web-platform-tests/css/css-cascade/unset-val-001.html
+++ b/tests/wpt/web-platform-tests/css/css-cascade/unset-val-001.html
@@ -4,6 +4,7 @@
   <meta charset="utf-8">
   <title>CSS Cascade: the "unset" value</title>
   <link rel="author" title="Chris Rebert" href="http://chrisrebert.com">
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
   <link rel="help" href="http://www.w3.org/TR/css-cascade-3/#inherit-initial">
   <link rel="help" href="http://www.w3.org/TR/css-cascade-4/#inherit-initial">
   <link rel="match" href="reference/ref-filled-green-100px-square.xht">
@@ -16,15 +17,17 @@
 }
 .under {
   background-color: green;
+  margin-bottom: -100px;
 }
 .outer {
   color: green;
+  background: red;
 }
 .inner {
-  position: absolute;
   color: red;
   background-color: red;
   font-size: 40px;
+  text-align: center;
 }
 .inner {
   color: unset;/* inherit from .outer */
@@ -35,9 +38,9 @@
 <body>
   <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-  <div class="outer">
-    <div class="inner square">WW</div>
+  <div class="outer square">
     <div class="under square"></div>
+    <div class="inner square">XX</div>
   </div>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-026.html b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-026.html
index d0815186edb..1306493f62a 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-026.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-026.html
@@ -16,9 +16,14 @@
 .hidden {
   content-visibility: hidden;
 }
+.spacer {
+  height: 10000px;
+}
 </style>
 <div id="container"></div>
-<div id="async_container"></div>
+<div id="onscreen_container"></div>
+<div class=spacer></div>
+<div id="offscreen_container"></div>
 
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -37,30 +42,53 @@ test(() => {
 }, "content-visibility: hidden adds contain: size layout style;");
 
 async_test((t) => {
-  setUp(async_container);
-  async_container.classList.add("auto");
-  t.step(() => assert_equals(getComputedStyle(async_container).contain, "size layout style paint"));
-  // Considering this as frame 1:
-  // At frame 2, the container has size-containment, and intersection
-  //   observations will be delivered at the end of that frame.
-  // At frame 3, the container still has size-containment, because visiblility
-  //   switch happens after rAF-callbacks have run.
-  // At frame 4, the container is no longer size-contained since it is visible.
-  requestAnimationFrame(() => {
-    // Frame 2 checks:
-    t.step(() => assert_equals(getComputedStyle(async_container).contain, "size layout style paint"));
+  setUp(onscreen_container);
+  setUp(offscreen_container);
 
+  function runTest() {
+    onscreen_container.classList.add("auto");
+    offscreen_container.classList.add("auto");
+
+    t.step(() => assert_equals(getComputedStyle(onscreen_container).contain, "size layout style paint", "initial onscreen"));
+    t.step(() => assert_equals(getComputedStyle(offscreen_container).contain, "size layout style paint", "initial offscreen"));
+    // Considering this as frame 1, at the end of the frame intersection observation will happen
+    // and determine that on-screen is visible and off-screen is not. The on-screen switch will
+    // happen synchronously since this is the first time we check, so for the remainder of the
+    // frames, on-screen should not have a size containment.
+
+    // For off-screen container:
+    // At frame 2, we verify that it has size containment.
+    // At frame 3, we scroll it into view and verify it has size containment. At the end of the frame
+    //    we will determine that it is visible and schedule a visibility switch to happen at the next
+    //    frame (at post-rAF timing).
+    // At frame 4, we still have size containment until after rAF callbacks.
+    // At frame 5, the container is no longer size-contained since it is visible.
     requestAnimationFrame(() => {
-      // Frame 3 checks:
-      t.step(() => assert_equals(getComputedStyle(async_container).contain, "size layout style paint"));
+      // Frame 2 checks:
+      t.step(() => assert_equals(getComputedStyle(onscreen_container).contain, "layout style paint", "frame 2 onscreen"));
+      t.step(() => assert_equals(getComputedStyle(offscreen_container).contain, "size layout style paint", "frame 2 offscreen"));
 
       requestAnimationFrame(() => {
-        // Frame 4 checks:
-        t.step(() => assert_equals(getComputedStyle(async_container).contain, "layout style paint"));
-        t.done();
+        offscreen_container.scrollIntoView();
+
+        // Frame 3 checks:
+        t.step(() => assert_equals(getComputedStyle(offscreen_container).contain, "size layout style paint", "frame 3"));
+
+        requestAnimationFrame(() => {
+          // Frame 4 checks:
+          t.step(() => assert_equals(getComputedStyle(offscreen_container).contain, "size layout style paint", "frame 4"));
+
+          requestAnimationFrame(() => {
+            // Frame 5 checks:
+            t.step(() => assert_equals(getComputedStyle(offscreen_container).contain, "layout style paint", "frame 5"));
+            t.done();
+          });
+        });
       });
     });
-  });
+  }
+  // rAF to ensure we know where we are in the lifecycle.
+  requestAnimationFrame(runTest);
 }, "content-visibility: auto adds contain: size layout style paint;");
 
 test(() => {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html b/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html
index 1994190bf94..2fbf939f6a5 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-001-print.html
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/ -->
 <html>
   <meta charset="utf-8">
-  <title>CSS Flexbox Test Reference: Test for pagination of a nested float element in a flex item in a printing context</title>
+  <title>CSS Flexbox Test: Test for pagination of a nested float element in a flex item in a printing context</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-break/#possible-breaks">
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html b/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html
index 83f47c47250..cc6037a8713 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-002-print.html
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/ -->
 <html>
   <meta charset="utf-8">
-  <title>CSS Flexbox Test Reference: Test for pagination of a nested float element with clearance in a flex item in a printing context</title>
+  <title>CSS Flexbox Test: Test for pagination of a nested float element with clearance in a flex item in a printing context</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-break/#possible-breaks">
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html
index e867430bc63..d4a678d0746 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/break-nested-float-in-flex-item-print-ref.html
@@ -3,7 +3,7 @@
      http://creativecommons.org/publicdomain/zero/1.0/ -->
 <html>
   <meta charset="utf-8">
-  <title>CSS Flexbox Test: Test for pagination of a nested float element in a flex item in a printing context</title>
+  <title>CSS Flexbox Test Reference: Test for pagination of a nested float element in a flex item in a printing context</title>
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/canvas-dynamic-change-001.html b/tests/wpt/web-platform-tests/css/css-flexbox/canvas-dynamic-change-001.html
index 38aa0006d57..09d524e7356 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/canvas-dynamic-change-001.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/canvas-dynamic-change-001.html
@@ -6,6 +6,7 @@
 <link href="support/flexbox.css" rel="stylesheet">
 <style>
 .red {
+  width: 600px;
   height: 400px;
   background: red;
 }
@@ -20,7 +21,10 @@ canvas {
 
 <div class="red">
   <div class="flexbox column">
-    <canvas id="canvas" data-expected-height="400"></canvas>
+    <!-- The height=400 attribute makes the aspect ratio be 300x400. 300 from
+         the fallback width of replaced elements. 400 from the attribute.
+	 After stretching to 600px wide, the height should be 800px. -->
+    <canvas id="canvas" data-expected-height="800"></canvas>
   </div>
 </div>
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html
new file mode 100644
index 00000000000..2d6f0857a2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-aspect-ratio-img-row-006.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<title>Aspect-ratio items with definite cross sizes from stretching</title>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#algo-main-item" title="Section B">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#definite-sizes" title="1.">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Flex base size is derived from aspect ratio when item has definite cross size due to stretching.">
+
+<p>Test passes if there is a filled green square.</p>
+
+<!-- Firefox 80 and Chrome 86 fail this test identically. They both show a 150x100 green rectangle. -->
+
+<div style="display: flex; width: 150px; height: 100px;">
+  <img src="support/200x200-green.png" style="min-width: 0px; flex-shrink: 0;">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html b/tests/wpt/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html
new file mode 100644
index 00000000000..e0cd66dd840
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/table-with-percent-intrinsic-width.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>CSS Flexbox: table descendants</title>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#flex-containers">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1123100">
+<meta name="assert" content="Percentage sized flex table does not use percent for intrinsic, or layout size.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+  .container {
+    display:flex;
+    width: 200px;
+  }
+  .left {
+    width:200px;
+    background:yellow;
+  }
+  main table {
+    border-spacing: 0;
+    background: red;
+  }
+  .spacer {
+    display:inline-block;
+    width: 10px;
+    height: 10px;
+    background: green;
+  }
+  main td {
+    padding: 0;
+  }
+</style>
+</head>
+<body>
+<main>
+<div class="container">
+  <div class="left">
+  </div>
+  <table style="width:100%" data-expected-width=100>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+  </table>
+</div>
+
+<div class="container">
+  <div class="left">
+  </div>
+  <table style="width:70%; flex-basis: 200px" data-expected-width=100>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+    <td data-expected-width=20><div class="spacer"></div><div class="spacer"></div></td>
+  </table>
+</div>
+</main>
+<div id=log></div>
+
+<script>
+  checkLayout("table");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html
new file mode 100644
index 00000000000..f66046f8a28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en-US">
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<iframe style="width:300px; height: 300px; border: 0"
+        srcdoc="<!DOCTYPE HTML>
+                <html>
+                <style>
+                @font-face {
+                  font-family: 'MarkB';
+                  src: url(resources/markB.ttf);
+                }
+
+                body { font-family: 'MarkB'; }
+                </style>
+                <body>
+                <p>B</p>
+                </body>
+                </html>">
+</iframe>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print.html b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print.html
new file mode 100644
index 00000000000..0cd7c4a9bcd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-in-iframe-print.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en-US">
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="match" href="downloadable-font-in-iframe-print-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-fonts/#font-face-rule">
+</head>
+<iframe style="width:300px; height: 300px; border: 0"
+        srcdoc="<!DOCTYPE HTML>
+                <html>
+                <style>
+                @font-face {
+                  font-family: 'MarkA';
+                  src: url(resources/markA.ttf);
+                }
+
+                body { font-family: 'MarkA'; }
+                </style>
+                <body>
+                <p>A</p>
+                </body>
+                </html>">
+</iframe>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print-ref.html
new file mode 100644
index 00000000000..28a92a86dca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en-US">
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style type="text/css">
+
+@font-face {
+  font-family: "MarkB";
+  src: url(resources/markB.ttf);
+}
+
+body { font-family: "MarkB"; }
+
+</style>
+</head>
+<body>
+
+<p>B</p>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print.html b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print.html
new file mode 100644
index 00000000000..5d23073d8fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/downloadable-font-print.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en-US">
+<head>
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="match" href="downloadable-font-print-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-fonts/#font-face-rule">
+<style type="text/css">
+
+@font-face {
+  font-family: "MarkA";
+  src: url(resources/markA.ttf);
+}
+
+body { font-family: "MarkA"; }
+
+</style>
+</head>
+<body>
+
+<p>A</p>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/markA.ttf b/tests/wpt/web-platform-tests/css/css-fonts/resources/markA.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..353e7ac3328297b91844430dbd6d93ad9d25779f
GIT binary patch
literal 1568
zcmdT^OKTKC5dL}|o2c;-h+r^>UKCB#tg{o;AQ9B);)BIk2vHCnH=Erho6IuVXd);c
z)PsoR<RRqjQAkt}A0T=#2M->+C>}&FUV<R;<YWB0XR;CT4_HHOeN|mmUDegw5CE3r
z3QQc$WO}l<rbe5Aghgx1krP|pzQ^Yd1EP=m+1!v<!G*+g>aWO$a_6fONn;!^*Kpk`
zcq5fCWG2`@sMi<D;{)}n$s=5ErGB%R_xhW?M+b@DleZUXsGqPeGglM!^~Is;Si>b;
zqyCV3Q`ygX=)ol8Tc|e-d1DnE!Y;0NQkTQtQ2yA{(`&hYA26CL{zx@^2G(l7=K2<>
z-pKb_8^4@c+4T*}%+IvoUC-m|HJJ>j>@njB^?De}N@9%hB%H!2Th$4BOlMMXfoyHD
z(V)5|sYs!1yOGis%larLU~}n)&VDnJ;serx-UjR_QaP(SYjkvAe?R9TvB#8QCr&ZC
zpNp}N&Lts48A%l)vh1E+u~Oxwaw=|#{r6E*ku9*GW{{v1+??4tDMT{-6uyZ4X%dOr
zW>A&ZPK8ht^DUOXVEjv}`}2R3zSr0ke;J-alIOC?m}K*HNKFfD?V72xFy~Gu?Dt(W
zra_2lQ<-gLo~cWSA6+v%!a292G1<7Wqj6nQEcyKMr7`()AZhTLn&^*jpUSz6`L`uk
z*LYsc|J-L@{eItW67#dOzurWwk97s^)+V-@H=Z*g3EsDf7#qxZC&ngg{~BWpwvaKl
zu}U0>af0@|x-HfcX6hwJSYRox#@N6L+>Wt{y{sYfv9Of?;0W80Vnd7*w4X#bd{i)w
z03{SqM3uL$6*;s~x^Vb)qFp1UNo47Nk-lYq9(5HTFoXK_7+oS72D<&qcu*=7tFkrM
zCSAwrY<C^kky-y@sa*DCw;xpez^j&gI%gRfU=Vu<y<m{yIP$D!RPPZ`%@;<?9zjND
zuWA|4BhLz4{-;%CJIRZgBHhIfR-gW(17!T+YQ_%=dFiGcxl`&LDcv3IX<g&L>gnZ9
z0Y>8Pq&}Cl-dCNF<Vf<t2z!x^lTJB~L(5_*3r%rq@f#LCVAcO3zDS(7!3nKbh_68O
Qc2Rlz^;d%m`SX4J4YPsV761SM

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-fonts/resources/markB.ttf b/tests/wpt/web-platform-tests/css/css-fonts/resources/markB.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c683ddf945d8d9161442a7444f40178d6502f94a
GIT binary patch
literal 1568
zcmdT^OKTKC5dL}|n?&Oy5Wzr@UZ3%ib#_DzA%Y~jsJIw3gy==b&1QGWCbLX7k_{*x
z)Pn@c$wSClZ$g5C_(Hts!Gi}cN)DozTttv~@-cqhJ6T2j1J=+}UsYFCf7RVH5CB%;
zGEDTQQhn(gv*Rs5%%ZpT#Hroxz{B&$0Wm=PTxP^8S(Vsh+AledWiFH@;zk89*K^*=
zd1Iw8WF^?&XxHb8m7)5?%n8o7(Vog@y}=gm!BOG`j(vGL>Zk2Xtkq0=bAF^e(RdM8
zY2T;aT=X*@`Y^-%R@#jt-b4w<aDek2wB@Kbl0Eh0>;}%?1&o%GKUNN(;xyNP#ra)O
zy>Z;$xa!l{HC<n@(p;nmZ~GoztLb<+Yfl)DXxGC~UJ7%JN8v2a*or6Y30+CSWwEu#
zMx*MMqB4c{9YjKVEbG0PhRvz#y82XAi+4y0MjNoJnJQTEtV!?C;X$5<M7Jr!4xC~3
zASa_3T}wiUBH}7Vq}e^YB2yKmYO2v1#UG-jGFxFmok5IRaB)`WNujF458<;Yo-Prq
zEe6H3wkw2MSnn70W#^w-U7-J3^u5N8=t*%G;@p=V#tfUULt;)~ch`KKg^%uB%wFi4
zHw{9}naXV|_k3MUeCwL$7JhX1G{u{??P=N+7Y&QgpBppZhvEi5DHDUy?Nc>Zvi{!q
zy4qM0OWzNfSH9l0o5j+L7e8KChu+oIxKlf^ofwF);C-8pu)&JAB5acT=LlP{g^aL`
zwc<#GWAta$ZLu1-LO(|p3#`DE2pd?9n-MnAO%Bx<3oG~qSFsH#wnjKc|7rBVM+p@K
zC?JPC%Di=L$Y49Q3x`h!+BH&^M4IuFj4kr<Xsi5y71Y~fc7bRV=<!RHppeU#Wm{&u
zbRDOo-E~|?rv1r6vFOPjKPdTuS1$MrPBSyWFgYXb1;bP)ktLgPy+%MYn;S2B1Sws;
ztaZSMtY(?e%sMr@<w_FDcCnxAlfQL<ls{Td`9Ur#-Gn1MrCyQR-QS+n9RJ0qpDP6z
zi@K9~Uy}TnsQpp9g8pnU#$Kf3BomI~(DQdwJT>*jQo?&=_AlWdi6?IGgtjQezktdR
PD)i0gAB{@?{(t-li&@+j

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html
new file mode 100644
index 00000000000..7876656c208
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+div {
+  float: left;
+  width: 200px;
+  height: 200px;
+  background: green;
+}
+</style>
+<div></div>
+<div style="margin-top: 100px"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html
new file mode 100644
index 00000000000..5398b7e9c1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/self-baseline/grid-self-baseline-008.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: baseline context and self alignment</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-grid/#alignment">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-align-self">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#align-by-baseline">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#align-items-property">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#align-self-property">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1121761">
+<link rel="match" href="grid-self-baseline-008-ref.html">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<meta name="assert" content="Test baseline alignment with percentage track sizing functions and grid items being or containing replaced elements with aspect ratio and percentage sizes." />
+<style>
+.grid {
+  display: grid;
+  width: 400px;
+  grid-template-columns: 25% 25% 25% 25%;
+  line-height: 0;
+}
+.percent {
+  width: 100%;
+}
+canvas {
+  background: green;
+}
+</style>
+<div class="grid alignItemsBaseline">
+  <canvas width="100" height="200"></canvas>
+  <canvas width="200" height="400" class="percent"></canvas>
+  <div>
+    <canvas width="100" height="100" class="percent"></canvas>
+    <canvas width="100" height="100" class="percent"></canvas>
+  </div>
+  <div class="percent">
+    <canvas width="100" height="100" class="percent"></canvas>
+    <canvas width="100" height="100" class="percent"></canvas>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html
index f570f02aa70..5c740681f8f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-track-sizes-001.html
@@ -40,49 +40,54 @@ function checkTrackSizes(span, trackList, expectedCols, expectedRows) {
   TestingUtils.testGridTemplateColumnsRows("grid", trackList, trackList, expectedCols, expectedRows);
 }
 
-// Item spanning a single track
-checkTrackSizes(1, "auto", "120px");
-checkTrackSizes(1, "min-content", "30px", "40px");
-checkTrackSizes(1, "max-content", "60px", "30px");
+setup({ explicit_done: true });
+document.fonts.ready.then(() => {
+  // Item spanning a single track
+  checkTrackSizes(1, "auto", "120px");
+  checkTrackSizes(1, "min-content", "30px", "40px");
+  checkTrackSizes(1, "max-content", "60px", "30px");
 
-checkTrackSizes(1, "minmax(0, auto)", "120px");
-checkTrackSizes(1, "minmax(0, min-content)", "30px", "40px");
-checkTrackSizes(1, "minmax(0, max-content)", "60px", "30px");
+  checkTrackSizes(1, "minmax(0, auto)", "120px");
+  checkTrackSizes(1, "minmax(0, min-content)", "30px", "40px");
+  checkTrackSizes(1, "minmax(0, max-content)", "60px", "30px");
 
-checkTrackSizes(1, "minmax(auto, 10px)", "12px");
-checkTrackSizes(1, "minmax(min-content, 10px)", "30px", "40px");
-checkTrackSizes(1, "minmax(max-content, 10px)", "60px", "30px");
+  checkTrackSizes(1, "minmax(auto, 10px)", "12px");
+  checkTrackSizes(1, "minmax(min-content, 10px)", "30px", "40px");
+  checkTrackSizes(1, "minmax(max-content, 10px)", "60px", "30px");
 
-// Item spanning two identical tracks
+  // Item spanning two identical tracks
 
-checkTrackSizes(2, "auto auto", "60px 60px");
-checkTrackSizes(2, "min-content min-content", "15px 15px", "20px 20px");
-checkTrackSizes(2, "max-content max-content", "30px 30px", "15px 15px");
+  checkTrackSizes(2, "auto auto", "60px 60px");
+  checkTrackSizes(2, "min-content min-content", "15px 15px", "20px 20px");
+  checkTrackSizes(2, "max-content max-content", "30px 30px", "15px 15px");
 
-checkTrackSizes(2, "minmax(0, auto) minmax(0, auto)", "60px 60px");
-checkTrackSizes(2, "minmax(0, min-content) minmax(0, min-content)", "15px 15px", "20px 20px");
-checkTrackSizes(2, "minmax(0, max-content) minmax(0, max-content)", "30px 30px", "15px 15px");
+  checkTrackSizes(2, "minmax(0, auto) minmax(0, auto)", "60px 60px");
+  checkTrackSizes(2, "minmax(0, min-content) minmax(0, min-content)", "15px 15px", "20px 20px");
+  checkTrackSizes(2, "minmax(0, max-content) minmax(0, max-content)", "30px 30px", "15px 15px");
 
-checkTrackSizes(2, "minmax(auto, 4px) minmax(auto, 4px)", "6px 6px");
-checkTrackSizes(2, "minmax(auto, 10px) minmax(auto, 10px)", "10px 10px");
-checkTrackSizes(2, "minmax(min-content, 10px) minmax(min-content, 10px)", "15px 15px", "20px 20px");
-checkTrackSizes(2, "minmax(max-content, 10px) minmax(max-content, 10px)", "30px 30px", "15px 15px");
+  checkTrackSizes(2, "minmax(auto, 4px) minmax(auto, 4px)", "6px 6px");
+  checkTrackSizes(2, "minmax(auto, 10px) minmax(auto, 10px)", "10px 10px");
+  checkTrackSizes(2, "minmax(min-content, 10px) minmax(min-content, 10px)", "15px 15px", "20px 20px");
+  checkTrackSizes(2, "minmax(max-content, 10px) minmax(max-content, 10px)", "30px 30px", "15px 15px");
 
-// Item spanning a fixed track also
-checkTrackSizes(2, "20px auto", "20px 100px");
-checkTrackSizes(2, "20px min-content", "20px 10px", "20px 20px");
-checkTrackSizes(2, "20px max-content", "20px 40px", "20px 10px");
+  // Item spanning a fixed track also
+  checkTrackSizes(2, "20px auto", "20px 100px");
+  checkTrackSizes(2, "20px min-content", "20px 10px", "20px 20px");
+  checkTrackSizes(2, "20px max-content", "20px 40px", "20px 10px");
 
-checkTrackSizes(2, "20px minmax(0, auto)", "20px 100px");
-checkTrackSizes(2, "20px minmax(0, min-content)", "20px 10px", "20px 20px");
-checkTrackSizes(2, "20px minmax(0, max-content)", "20px 40px", "20px 10px");
+  checkTrackSizes(2, "20px minmax(0, auto)", "20px 100px");
+  checkTrackSizes(2, "20px minmax(0, min-content)", "20px 10px", "20px 20px");
+  checkTrackSizes(2, "20px minmax(0, max-content)", "20px 40px", "20px 10px");
 
-checkTrackSizes(2, "20px minmax(auto, 30px)", "20px 30px");
-checkTrackSizes(2, "20px minmax(min-content, 6px)", "20px 10px", "20px 20px");
-checkTrackSizes(2, "20px minmax(min-content, 40px)", "20px 40px", "20px 40px");
-checkTrackSizes(2, "20px minmax(max-content, 6px)", "20px 40px", "20px 10px");
-checkTrackSizes(2, "20px minmax(max-content, 30px)", "20px 40px", "20px 30px");
+  checkTrackSizes(2, "20px minmax(auto, 30px)", "20px 30px");
+  checkTrackSizes(2, "20px minmax(min-content, 6px)", "20px 10px", "20px 20px");
+  checkTrackSizes(2, "20px minmax(min-content, 40px)", "20px 40px", "20px 40px");
+  checkTrackSizes(2, "20px minmax(max-content, 6px)", "20px 40px", "20px 10px");
+  checkTrackSizes(2, "20px minmax(max-content, 30px)", "20px 40px", "20px 30px");
 
-// Item spanning two mismatched intrinsic tracks
-checkTrackSizes(2, "max-content min-content", "45px 15px", "15px 15px");
+  // Item spanning two mismatched intrinsic tracks
+  checkTrackSizes(2, "max-content min-content", "45px 15px", "15px 15px");
+
+  done();
+});
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-position.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-position.html
new file mode 100644
index 00000000000..cf4fcd4a301
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-position.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation with background positions</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-background-position-ref.html">
+<meta name="fuzzy" content="10;100">
+<style>
+    .exif-2 {
+        position: absolute;
+        top: 10px;
+        left: 10px;
+        width: 50px;
+        height: 50PX;
+        background-color: grey;
+        background-image: url(support/exif-orientation-2-ur.jpg);
+        background-repeat: no-repeat;
+        background-position: -30px -20px;
+    }
+
+    .exif-6 {
+        position: absolute;
+        top: 10px;
+        left: 70px;
+        width: 50px;
+        height: 50PX;
+        background-color: grey;
+        background-image: url(support/exif-orientation-6-ru.jpg);
+        background-repeat: no-repeat;
+        background-position: -20px -30px;
+    }
+
+</style>
+</head>
+<body>
+    <div class="exif-2">
+    </div>
+    <div class="exif-6">
+    </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html
new file mode 100644
index 00000000000..a19e535dabc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-position-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation with background positions reference</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<style>
+    .exif-2 {
+        position: absolute;
+        top: 10px;
+        left: 10px;
+        width: 50px;
+        height: 50PX;
+        background-color: grey;
+        background-image: url(../support/exif-orientation-2-ur-pre-rotated.jpg);
+        background-repeat: no-repeat;
+        background-position: -30px -20px;
+    }
+
+    .exif-6 {
+        position: absolute;
+        top: 10px;
+        left: 70px;
+        width: 50px;
+        height: 50PX;
+        background-color: grey;
+        background-image: url(../support/exif-orientation-6-ru-pre-rotated.jpg);
+        background-repeat: no-repeat;
+        background-position: -20px -30px;
+    }
+
+</style>
+</head>
+<body>
+    <div class="exif-2">
+    </div>
+    <div class="exif-6">
+    </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2-ref.html b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2-ref.html
new file mode 100644
index 00000000000..9405c845ce7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <title>HTML LI element: explicit scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <style>
+    #a::before { content: "1"; }
+    #b::before { content: "2"; }
+    #c::before { content: "2.1"; }
+    #d::before { content: "2.2"; }
+  </style>
+</head>
+<body>
+<ol>
+<li value="1" id="a"></li>
+<li value="2" id="b"></li>
+<ol><li value="1" id="c"></li></ol>
+<li value="2" id="d"></li>
+</ol>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2.html b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2.html
new file mode 100644
index 00000000000..959ff6660ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-2.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <title>HTML LI element: explicit scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/grouping-content.html#the-li-element">
+  <link rel="help" href="https://drafts.csswg.org/css-lists/#list-item-counter">
+  <link rel="match" href="counter-list-item-2-ref.html">
+  <style>
+    li::before { content: counters(list-item,'.'); }
+  </style>
+</head>
+<body>
+<ol>
+<li></li>
+<li></li>
+<ol><li></li></ol>
+<li></li>
+</ol>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3-ref.html b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3-ref.html
new file mode 100644
index 00000000000..926d8df504e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <title>HTML LI element: explicit scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <style>
+    #a::before { content: "1"; }
+    #b::before { content: "2"; }
+    #c::before { content: "2.1"; }
+    #d::before { content: "3"; }
+  </style>
+</head>
+<body>
+<ol>
+<li value="1" id="a"></li>
+<li value="2" id="b"></li>
+<ol><li value="1" id="c"></li></ol>
+<li value="3" id="d"></li>
+</ol>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3.html b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3.html
new file mode 100644
index 00000000000..096fdfbc289
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/counter-list-item-3.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <title>HTML LI element: explicit scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/grouping-content.html#the-li-element">
+  <link rel="help" href="https://drafts.csswg.org/css-lists/#list-item-counter">
+  <link rel="match" href="counter-list-item-3-ref.html">
+  <style>
+    li::before { content: counters(list-item,'.'); }
+  </style>
+</head>
+<body>
+<ol>
+<li></li>
+<li></li>
+<div><ol><li></li></ol></div>
+<li></li>
+</ol>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html
new file mode 100644
index 00000000000..ddbf0e9812c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div style="transform: rotate(45deg); width: 200px; height: 200px; will-change: transform">
+  <div style="position: relative; top: 30px; left: 30px; width: 140px; height: 140px; background: green"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html
new file mode 100644
index 00000000000..a609e9cc915
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-rotated-will-change-transform.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<title>Clip Path: should be correctly rotated by transform with will-change:transform</title>
+<link rel="help" href="http://www.w3.org/TR/css-masking-1/#the-clip-path">
+<link rel="match" href="clip-path-rotated-will-change-transform-ref.html">
+<style>div { width: 200px; height: 200px; position: absolute; }</style>
+<div style="transform: rotate(45deg); clip-path: inset(31px)">
+  <div style="will-change: transform; background: red"></div>
+</div>
+<div style="transform: rotate(45deg); will-change: transform">
+  <div style="top: 30px; left: 30px; width: 140px; height: 140px; background: green"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context-ref.html b/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context-ref.html
new file mode 100644
index 00000000000..056af223758
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<p>Expected: A green box with no red visible.</p>
+<div style="width: 100px; height: 100px; background: green;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context.html b/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context.html
new file mode 100644
index 00000000000..cbd07ee6380
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip/clip-no-stacking-context.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Clip does not create a stacking context</title>
+<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#propdef-clip">
+<link rel="match" href="clip-no-stacking-context-ref.html">
+<link rel="author" title="Philip Rogers" href="mailto:pdr@chromium.org">
+
+<style>
+  #bottom {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background: red;
+    z-index: 1;
+  }
+  #clip {
+    position: absolute;
+    clip: rect(0px, 100px, 100px, 0px);
+  }
+  #top {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background: green;
+    z-index: 3;
+  }
+</style>
+
+<p>Expected: A green box with no red visible.</p>
+<div id="bottom"></div>
+<!-- If #clip creates a stacking context, it will be below #bottom (which has a
+     higher z-index) which will force #top to be below #bottom as well. This
+     should not happen because #clip should not create a stacking context. -->
+<div id="clip">
+  <div id="top"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-000-crash.html b/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-000-crash.html
new file mode 100644
index 00000000000..407697e8433
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-000-crash.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1123710">
+<div style="columns:2;">
+  <legend style="column-span:all; columns:2;">
+    <div></div>
+  </legend>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-001-crash.html b/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-001-crash.html
new file mode 100644
index 00000000000..6126ec61e24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/spanning-legend-001-crash.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1123792">
+<div style="columns:2;">
+  <legend id="legend" style="column-span:all;"></legend>
+</div>
+<script>
+  legend.getBoundingClientRect();
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-001.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-001.html
index 84bf8cdae55..dacb658db64 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/clip-001.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-001.html
@@ -10,7 +10,6 @@
     width: 100px;
     height: 100px;
     background: red;
-    overflow: -moz-hidden-unscrollable;
     overflow: clip;
   }
 
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-002-ref.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-002-ref.html
new file mode 100644
index 00000000000..19c901981d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-002-ref.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Reference: overflow: clip can be combined with overflow: visible</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<style>
+  .outer {
+    width: 50px;
+    height: 50px;
+    margin-left: 100px;
+    margin-top: 100px;
+    background: black;
+  }
+
+  .inner {
+    position: relative;
+    background: blue;
+    height: 100px;
+    width: 100px;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no overflow -->
+<div class="outer">
+  <div class="inner" style="width:50px; height:50px;"></div>
+</div>
+
+<!-- there should be overflow in the vertical dimension, but not horizontally -->
+<div class="outer">
+  <div class="inner" style="top:-20px; width:50px"></div>
+</div>
+
+<!-- there should be overflow in the horizontal dimension, but not vertically -->
+<div class="outer">
+  <div class="inner" style="left:-40px; height:50px"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-002.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-002.html
new file mode 100644
index 00000000000..cd8b9a3cbeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-002.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: overflow:clip can be combined with overflow:visible</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="match" href="clip-002-ref.html">
+<style>
+  .outer {
+    width: 50px;
+    height: 50px;
+    margin-left: 100px;
+    margin-top: 100px;
+    background: black;
+  }
+
+  .inner {
+    position: relative;
+    top: -20px;
+    left: -40px;
+    background: blue;
+    height: 100px;
+    width: 100px;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no overflow -->
+<div class="outer" style="overflow:clip">
+  <div class="inner"></div>
+</div>
+
+<!-- there should be overflow in the vertical dimension, but not horizontally -->
+<div class="outer" style="overflow-x:clip">
+  <div class="inner"></div>
+</div>
+
+<!-- there should be overflow in the horizontal dimension, but not vertically -->
+<div class="outer" style="overflow-y:clip">
+  <div class="inner"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-003-ref.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-003-ref.html
new file mode 100644
index 00000000000..5de31068e2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-003-ref.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Reference: overflow:clip can be combined with overflow:visible</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<style>
+  .wrapper {
+    margin-left: 30px;
+    margin-bottom: 20px;
+    width: 50px;
+    height: 50px;
+  }
+  .outer {
+    width: 50px;
+    height: 50px;
+    background: black;
+  }
+
+  .inner {
+    position: relative;
+    top: -10px;
+    left: -10px;
+    height: 100px;
+    width: 100px;
+    background: blue;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no scrollbars -->
+<div class="wrapper" style="overflow: hidden">
+<div class="outer">
+  <div class="inner"></div>
+</div>
+</div>
+
+<!-- there should be no white areas inside the outline -->
+<div class="wrapper" style="outline: solid">
+<div class="outer">
+  <div class="inner" style="left:0; width:50px"></div>
+</div>
+</div>
+
+<!-- there should be a vertical scrollbar, but not a horizontal one -->
+<div class="wrapper" style="overflow: hidden scroll; margin-top:50px">
+<div class="outer">
+  <div class="inner" style="width:1px"></div>
+</div>
+</div>
+
+<!-- there should be no white areas inside the outline -->
+<div class="wrapper" style="outline: solid">
+<div class="outer">
+  <div class="inner" style="top:0; height:50px"></div>
+</div>
+</div>
+
+<!-- there should be horizontal scrollbar, but not a vertical one -->
+<div class="wrapper" style="overflow: scroll hidden">
+<div class="outer">
+  <div class="inner" style="height:1px"></div>
+</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-003.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-003.html
new file mode 100644
index 00000000000..0c7e9bfa254
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-003.html
@@ -0,0 +1,63 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: overflow:clip can be combined with overflow:visible</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="match" href="clip-003-ref.html">
+<style>
+  .wrapper {
+    margin-left: 30px;
+    margin-bottom: 20px;
+    width: 50px;
+    height: 50px;
+  }
+  .outer {
+    width: 50px;
+    height: 50px;
+    background: black;
+  }
+
+  .inner {
+    position: relative;
+    top: -10px;
+    left: -10px;
+    height: 100px;
+    width: 100px;
+    background: blue;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no scrollbars -->
+<div class="wrapper" style="overflow: auto">
+<div class="outer" style="overflow:clip; outline:solid red">
+  <div class="inner"></div>
+</div>
+</div>
+
+<!-- there should be no white areas inside the outline -->
+<div class="wrapper" style="outline: solid">
+<div class="outer" style="overflow-x:clip">
+  <div class="inner"></div>
+</div>
+</div>
+
+<!-- there should be a vertical scrollbar, but not a horizontal one -->
+<div class="wrapper" style="overflow: auto; margin-top:50px">
+<div class="outer" style="overflow-x:clip">
+  <div class="inner" style="width:1px"></div>
+</div>
+</div>
+
+<!-- there should be no white areas inside the outline -->
+<div class="wrapper" style="outline: solid">
+<div class="outer" style="overflow-y:clip">
+  <div class="inner"></div>
+</div>
+</div>
+
+<!-- there should be horizontal scrollbar, but not a vertical one -->
+<div class="wrapper" style="overflow: auto">
+<div class="outer" style="overflow-y:clip">
+  <div class="inner" style="height:1px"></div>
+</div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-004-ref.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-004-ref.html
new file mode 100644
index 00000000000..39e12445d40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-004-ref.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Reference: overflow: clip can be combined with overflow: visible</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<style>
+  .outer {
+    width: 50px;
+    height: 50px;
+    margin-left: 100px;
+    margin-top: 100px;
+    background: black;
+  }
+
+  .inner {
+    position: relative;
+    background: blue;
+    height: 100px;
+    width: 100px;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no overflow -->
+<div class="outer">
+  <div class="inner" style="width:50px; height:50px;"></div>
+</div>
+
+<!-- there should be overflow in the vertical dimension, but not horizontally -->
+<div class="outer">
+  <div class="inner" style="top:-10px; width:50px"></div>
+</div>
+
+<!-- there should be overflow in the horizontal dimension, but not vertically -->
+<div class="outer">
+  <div class="inner" style="left:-30px; height:50px"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-004.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-004.html
new file mode 100644
index 00000000000..30dde4a5e12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-004.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: overflow:clip can be combined with overflow:visible</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="match" href="clip-004-ref.html">
+<style>
+  .outer {
+    width: 30px;
+    height: 30px;
+    padding: 10px;
+    margin-left: 100px;
+    margin-top: 100px;
+    background: black;
+  }
+
+  .inner {
+    position: relative;
+    top: -20px;
+    left: -40px;
+    background: blue;
+    height: 100px;
+    width: 100px;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no overflow -->
+<div class="outer" style="overflow:clip">
+  <div class="inner"></div>
+</div>
+
+<!-- there should be overflow in the vertical dimension, but not horizontally -->
+<div class="outer" style="overflow-x:clip">
+  <div class="inner"></div>
+</div>
+
+<!-- there should be overflow in the horizontal dimension, but not vertically -->
+<div class="outer" style="overflow-y:clip">
+  <div class="inner"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-005-ref.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-005-ref.html
new file mode 100644
index 00000000000..09081e25039
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-005-ref.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Reference: overflow:clip doesn't affect the box' own outline</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<style>
+  .outer {
+    width: 50px;
+    height: 50px;
+    margin-left: 100px;
+    margin-top: 100px;
+    background: black;
+    outline: 2px solid grey;
+  }
+
+  .inner {
+    position: relative;
+    background: blue;
+    height: 100px;
+    width: 100px;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no overflow -->
+<div class="outer">
+  <div class="inner" style="width:50px; height:50px;"></div>
+</div>
+
+<!-- there should be overflow in the vertical dimension, but not horizontally -->
+<div class="outer">
+  <div class="inner" style="top:-10px; width:50px"></div>
+</div>
+
+<!-- there should be overflow in the horizontal dimension, but not vertically -->
+<div class="outer">
+  <div class="inner" style="left:-30px; height:50px"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/clip-005.html b/tests/wpt/web-platform-tests/css/css-overflow/clip-005.html
new file mode 100644
index 00000000000..e55f4b22fcb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/clip-005.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: overflow:clip doesn't affect the box' own outline</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1531609">
+<link rel="help" href="https://drafts.csswg.org/css-overflow/#valdef-overflow-clip">
+<link rel="match" href="clip-005-ref.html">
+<style>
+  .outer {
+    width: 30px;
+    height: 30px;
+    padding: 10px;
+    margin-left: 100px;
+    margin-top: 100px;
+    background: black;
+    outline: 2px solid grey;
+  }
+
+  .inner {
+    position: relative;
+    top: -20px;
+    left: -40px;
+    background: blue;
+    height: 100px;
+    width: 100px;
+    opacity: 0.5;
+  }
+</style>
+<!-- there should be no overflow -->
+<div class="outer" style="overflow:clip">
+  <div class="inner"></div>
+</div>
+
+<!-- there should be overflow in the vertical dimension, but not horizontally -->
+<div class="outer" style="overflow-x:clip">
+  <div class="inner"></div>
+</div>
+
+<!-- there should be overflow in the horizontal dimension, but not vertically -->
+<div class="outer" style="overflow-y:clip">
+  <div class="inner"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/dynamic-visible-to-clip-001.html b/tests/wpt/web-platform-tests/css/css-overflow/dynamic-visible-to-clip-001.html
index b97701bfb29..e2011324dda 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/dynamic-visible-to-clip-001.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/dynamic-visible-to-clip-001.html
@@ -32,7 +32,6 @@ onload = function() {
   let target = document.getElementById("target");
   window.unused = target.getBoundingClientRect(); // Update layout
   requestAnimationFrame(() => requestAnimationFrame(() => {
-    target.style.overflow = "-moz-hidden-unscrollable";
     target.style.overflow = "clip";
     document.documentElement.removeAttribute("class");
   }));
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007.html b/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007.html
index 9ce13ed8de3..ee6e1a1cc69 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-007.html
@@ -7,7 +7,6 @@
 <link rel="match" href="overflow-body-propagation-007-ref.html">
 <style>
   body {
-    overflow-x: -moz-hidden-unscrollable; /* will be removed in bug 1531609 */
     overflow-x: clip;
     width: 30px;
     height: 30px;
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008.html b/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008.html
index 867cd379c73..7da4a5a7504 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-008.html
@@ -7,7 +7,6 @@
 <link rel="match" href="overflow-body-propagation-008-ref.html">
 <style>
   body {
-    overflow-y: -moz-hidden-unscrollable; /* will be removed in bug 1531609 */
     overflow-y: clip;
     width: 30px;
     height: 30px;
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009.html b/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009.html
index 6924719f978..33cb079487b 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/overflow-body-propagation-009.html
@@ -7,7 +7,6 @@
 <link rel="match" href="overflow-body-propagation-009-ref.html">
 <style>
   body {
-    overflow: -moz-hidden-unscrollable; /* will be removed in bug 1531609 */
     overflow: clip;
     width: 30px;
     height: 30px;
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-computed.html b/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-computed.html
index 1bacd9b01e8..563d1b31d25 100644
--- a/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-overflow/parsing/overflow-computed.html
@@ -25,6 +25,7 @@ test_computed_value("overflow", 'clip auto', 'hidden auto');
 test_computed_value("overflow", 'clip clip', 'clip');
 test_computed_value("overflow", 'clip hidden', 'hidden');
 test_computed_value("overflow", 'clip scroll', 'hidden scroll')
+test_computed_value("overflow", 'clip visible', 'clip visible')
 test_computed_value("overflow", 'hidden clip', 'hidden');
 test_computed_value("overflow", 'hidden visible', 'hidden auto');
 test_computed_value("overflow", 'scroll auto');
@@ -33,6 +34,7 @@ test_computed_value("overflow", 'scroll visible', 'scroll auto');
 test_computed_value("overflow", 'visible auto', 'auto');
 test_computed_value("overflow", 'visible hidden', 'auto hidden');
 test_computed_value("overflow", 'visible scroll', 'auto scroll');
+test_computed_value("overflow", 'visible clip', 'visible clip');
 test_computed_value("overflow", 'visible visible', 'visible');
 
 
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html
new file mode 100644
index 00000000000..b8c157a1ecd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-001.html
@@ -0,0 +1,187 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter: auto (classic scrollbars)</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+<link rel="help" href="https://www.w3.org/TR/css-overflow-4/#scollbar-gutter-property"/>
+<meta name="assert" content="Test scrollbar-gutter: auto with custom classic scrollbars">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+
+    .container {
+        scrollbar-gutter: auto;
+        height: 200px;
+        width: 200px;
+        margin: 1px;
+        padding: 0px;
+        border: none;
+        background: deepskyblue;
+    }
+
+    .content {
+        height: 100%;
+        width: 100%;
+        background: lightsalmon;
+    }
+
+    /* ensure that we are using classic scrollbars */
+    .classic {
+        scrollbar-width: 20px;
+        scrollbar-color: hsla(0, 0%, 20%, 0.6) hsla(0, 0%, 40%, 0.3);
+    }
+    .classic::-webkit-scrollbar {
+        width: 20px;
+        height: 20px;
+    }
+    .classic::-webkit-scrollbar-track {
+        background-color: hsla(0, 0%, 40%, 0.4);
+    }
+    .classic::-webkit-scrollbar-thumb {
+        background-color: hsla(0, 0%, 20%, 0.8);
+        border-radius: 10px;
+    }
+
+    /* writing modes */
+    .horizontal {
+        writing-mode: horizontal-tb;
+        overflow-x: auto;
+    }
+    .vertical   {
+        writing-mode: vertical-rl;
+        overflow-y: auto;
+    }
+
+    /* overflow on the block direction */
+    .horizontal.auto    { overflow-y: auto;    }
+    .horizontal.scroll  { overflow-y: scroll;  }
+    .horizontal.visible { overflow:   visible; }
+    .horizontal.hidden  { overflow-y: hidden;  }
+    .vertical.auto      { overflow-x: auto;    }
+    .vertical.scroll    { overflow-x: scroll;  }
+    .vertical.visible   { overflow:   visible; }
+    .vertical.hidden    { overflow-x: hidden;  }
+
+    /* Note: not testing with overflow: clip; */
+
+</style>
+<script type="text/javascript">
+
+    function performTest() {
+        setup({explicit_done: true});
+
+        test(function() {
+            let container = document.getElementById('container_auto_h');
+            let content = document.getElementById('content_auto_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter auto, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_h');
+            let content = document.getElementById('content_scroll_h');
+            assert_equals(container.scrollWidth, 180, "scroll/auto scrollWidth");
+            assert_equals(container.clientWidth, 180, "scroll/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "scroll/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "scroll/auto offsetWidth");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter auto, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_visible_h');
+            let content = document.getElementById('content_visible_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter auto, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_h');
+            let content = document.getElementById('content_hidden_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "hidden/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "hidden/auto offsetWidth");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter auto, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_auto_v');
+            let content = document.getElementById('content_auto_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter auto, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_v');
+            let content = document.getElementById('content_scroll_v');
+            assert_equals(container.scrollHeight, 180, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 180, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "scroll/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "scroll/auto offsetHeight");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter auto, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_visible_v');
+            let content = document.getElementById('content_visible_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter auto, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_v');
+            let content = document.getElementById('content_hidden_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "hidden/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "hidden/auto offsetHeight");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter auto, vertical-rl");
+
+        done();
+    }
+
+</script>
+<body onload="performTest()">
+
+    Test scrollbar-gutter: auto, writing-mode: horizontal-tb
+
+    <div class="container classic horizontal auto" id="container_auto_h">
+        <div class="content" id="content_auto_h">overflow-y: auto</div>
+    </div>
+
+    <div class="container classic horizontal scroll" id="container_scroll_h">
+        <div class="content" id="content_scroll_h">overflow-y: scroll</div>
+    </div>
+
+    <div class="container classic horizontal visible" id="container_visible_h">
+        <div class="content" id="content_visible_h">overflow: visible</div>
+    </div>
+
+    <div class="container classic horizontal hidden" id="container_hidden_h">
+        <div class="content" id="content_hidden_h">overflow-y: hidden</div>
+    </div>
+
+    writing-mode: vertical-rl;
+
+    <div class="container classic vertical auto" id="container_auto_v">
+        <div class="content" id="content_auto_v">overflow-x: auto</div>
+    </div>
+
+    <div class="container classic vertical scroll" id="container_scroll_v">
+        <div class="content" id="content_scroll_v">overflow-x: scroll</div>
+    </div>
+
+    <div class="container classic vertical visible" id="container_visible_v">
+        <div class="content" id="content_visible_v">overflow: visible</div>
+    </div>
+
+    <div class="container classic vertical hidden" id="container_hidden_v">
+        <div class="content" id="content_hidden_v">overflow-x: hidden</div>
+    </div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002.html
new file mode 100644
index 00000000000..5cfc45c358c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-002.html
@@ -0,0 +1,187 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter: stable (classic scrollbars)</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+<link rel="help" href="https://www.w3.org/TR/css-overflow-4/#scollbar-gutter-property"/>
+<meta name="assert" content="Test scrollbar-gutter: stable with custom classic scrollbars">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+
+    .container {
+        scrollbar-gutter: stable;
+        height: 200px;
+        width: 200px;
+        margin: 1px;
+        padding: 0px;
+        border: none;
+        background: deepskyblue;
+    }
+
+    .content {
+        height: 100%;
+        width: 100%;
+        background: lightsalmon;
+    }
+
+    /* ensure that we are using classic scrollbars */
+    .classic {
+        scrollbar-width: 20px;
+        scrollbar-color: hsla(0, 0%, 20%, 0.6) hsla(0, 0%, 40%, 0.3);
+    }
+    .classic::-webkit-scrollbar {
+        width: 20px;
+        height: 20px;
+    }
+    .classic::-webkit-scrollbar-track {
+        background-color: hsla(0, 0%, 40%, 0.4);
+    }
+    .classic::-webkit-scrollbar-thumb {
+        background-color: hsla(0, 0%, 20%, 0.8);
+        border-radius: 10px;
+    }
+
+    /* writing modes */
+    .horizontal {
+        writing-mode: horizontal-tb;
+        overflow-x: auto;
+    }
+    .vertical   {
+        writing-mode: vertical-rl;
+        overflow-y: auto;
+    }
+
+    /* overflow on the block direction */
+    .horizontal.auto    { overflow-y: auto;    }
+    .horizontal.scroll  { overflow-y: scroll;  }
+    .horizontal.visible { overflow:   visible; }
+    .horizontal.hidden  { overflow-y: hidden;  }
+    .vertical.auto      { overflow-x: auto;    }
+    .vertical.scroll    { overflow-x: scroll;  }
+    .vertical.visible   { overflow:   visible; }
+    .vertical.hidden    { overflow-x: hidden;  }
+
+    /* Note: not testing with overflow: clip; */
+
+</style>
+<script type="text/javascript">
+
+    function performTest() {
+        setup({explicit_done: true});
+
+        test(function() {
+            let container = document.getElementById('container_auto_h');
+            let content = document.getElementById('content_auto_h');
+            assert_equals(container.scrollWidth, 180, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 180, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter stable, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_h');
+            let content = document.getElementById('content_scroll_h');
+            assert_equals(container.scrollWidth, 180, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 180, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "scroll/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "scroll/auto offsetWidth");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter stable, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_visible_h');
+            let content = document.getElementById('content_visible_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter stable, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_h');
+            let content = document.getElementById('content_hidden_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "hidden/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "hidden/auto offsetWidth");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter stable, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_auto_v');
+            let content = document.getElementById('content_auto_v');
+            assert_equals(container.scrollHeight, 180, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 180, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter stable, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_v');
+            let content = document.getElementById('content_scroll_v');
+            assert_equals(container.scrollHeight, 180, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 180, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "scroll/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "scroll/auto offsetHeight");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter stable, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_visible_v');
+            let content = document.getElementById('content_visible_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter stable, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_v');
+            let content = document.getElementById('content_hidden_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "hidden/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "hidden/auto offsetHeight");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter stable, vertical-rl");
+
+        done();
+    }
+
+</script>
+<body onload="performTest()">
+
+    Test scrollbar-gutter: stable, writing-mode: horizontal-tb
+
+    <div class="container classic horizontal auto" id="container_auto_h">
+        <div class="content" id="content_auto_h">overflow-y: auto</div>
+    </div>
+
+    <div class="container classic horizontal scroll" id="container_scroll_h">
+        <div class="content" id="content_scroll_h">overflow-y: scroll</div>
+    </div>
+
+    <div class="container classic horizontal visible" id="container_visible_h">
+        <div class="content" id="content_visible_h">overflow: visible</div>
+    </div>
+
+    <div class="container classic horizontal hidden" id="container_hidden_h">
+        <div class="content" id="content_hidden_h">overflow-y: hidden</div>
+    </div>
+
+    writing-mode: vertical-rl;
+
+    <div class="container classic vertical auto" id="container_auto_v">
+        <div class="content" id="content_auto_v">overflow-x: auto</div>
+    </div>
+
+    <div class="container classic vertical scroll" id="container_scroll_v">
+        <div class="content" id="content_scroll_v">overflow-x: scroll</div>
+    </div>
+
+    <div class="container classic vertical visible" id="container_visible_v">
+        <div class="content" id="content_visible_v">overflow: visible</div>
+    </div>
+
+    <div class="container classic vertical hidden" id="container_hidden_v">
+        <div class="content" id="content_hidden_v">overflow-x: hidden</div>
+    </div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-003.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-003.html
new file mode 100644
index 00000000000..17f724fb37c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-003.html
@@ -0,0 +1,187 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter: always (classic scrollbars)</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+<link rel="help" href="https://www.w3.org/TR/css-overflow-4/#scollbar-gutter-property"/>
+<meta name="assert" content="Test scrollbar-gutter: always with custom classic scrollbars">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+
+    .container {
+        scrollbar-gutter: always;
+        height: 200px;
+        width: 200px;
+        margin: 1px;
+        padding: 0px;
+        border: none;
+        background: deepskyblue;
+    }
+
+    .content {
+        height: 100%;
+        width: 100%;
+        background: lightsalmon;
+    }
+
+    /* ensure that we are using classic scrollbars */
+    .classic {
+        scrollbar-width: 20px;
+        scrollbar-color: hsla(0, 0%, 20%, 0.6) hsla(0, 0%, 40%, 0.3);
+    }
+    .classic::-webkit-scrollbar {
+        width: 20px;
+        height: 20px;
+    }
+    .classic::-webkit-scrollbar-track {
+        background-color: hsla(0, 0%, 40%, 0.4);
+    }
+    .classic::-webkit-scrollbar-thumb {
+        background-color: hsla(0, 0%, 20%, 0.8);
+        border-radius: 10px;
+    }
+
+    /* writing modes */
+    .horizontal {
+        writing-mode: horizontal-tb;
+        overflow-x: auto;
+    }
+    .vertical   {
+        writing-mode: vertical-rl;
+        overflow-y: auto;
+    }
+
+    /* overflow on the block direction */
+    .horizontal.auto    { overflow-y: auto;    }
+    .horizontal.scroll  { overflow-y: scroll;  }
+    .horizontal.visible { overflow:   visible; }
+    .horizontal.hidden  { overflow-y: hidden;  }
+    .vertical.auto      { overflow-x: auto;    }
+    .vertical.scroll    { overflow-x: scroll;  }
+    .vertical.visible   { overflow:   visible; }
+    .vertical.hidden    { overflow-x: hidden;  }
+
+    /* Note: not testing with overflow: clip; */
+
+</style>
+<script type="text/javascript">
+
+    function performTest() {
+        setup({explicit_done: true});
+
+        test(function() {
+            let container = document.getElementById('container_auto_h');
+            let content = document.getElementById('content_auto_h');
+            assert_equals(container.scrollWidth, 180, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 180, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter always, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_h');
+            let content = document.getElementById('content_scroll_h');
+            assert_equals(container.scrollWidth, 180, "scroll/auto scrollWidth");
+            assert_equals(container.clientWidth, 180, "scroll/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "scroll/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "scroll/auto offsetWidth");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter always, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_visible_h');
+            let content = document.getElementById('content_visible_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter always, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_h');
+            let content = document.getElementById('content_hidden_h');
+            assert_equals(container.scrollWidth, 200, "hidden/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "hidden/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "hidden/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "hidden/auto offsetWidth");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter always, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_auto_v');
+            let content = document.getElementById('content_auto_v');
+            assert_equals(container.scrollHeight, 180, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 180, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter always, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_v');
+            let content = document.getElementById('content_scroll_v');
+            assert_equals(container.scrollHeight, 180, "scroll/auto scrollHeight");
+            assert_equals(container.clientHeight, 180, "scroll/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "scroll/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "scroll/auto offsetHeight");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter always, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_visible_v');
+            let content = document.getElementById('content_visible_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter always, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_v');
+            let content = document.getElementById('content_hidden_v');
+            assert_equals(container.scrollHeight, 200, "hidden/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "hidden/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "hidden/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "hidden/auto offsetHeight");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter always, vertical-rl");
+
+        done();
+    }
+
+</script>
+<body onload="performTest()">
+
+    Test scrollbar-gutter: always, writing-mode: horizontal-tb
+
+    <div class="container classic horizontal auto" id="container_auto_h">
+        <div class="content" id="content_auto_h">overflow-y: auto</div>
+    </div>
+
+    <div class="container classic horizontal scroll" id="container_scroll_h">
+        <div class="content" id="content_scroll_h">overflow-y: scroll</div>
+    </div>
+
+    <div class="container classic horizontal visible" id="container_visible_h">
+        <div class="content" id="content_visible_h">overflow: visible</div>
+    </div>
+
+    <div class="container classic horizontal hidden" id="container_hidden_h">
+        <div class="content" id="content_hidden_h">overflow-y: hidden</div>
+    </div>
+
+    writing-mode: vertical-rl;
+
+    <div class="container classic vertical auto" id="container_auto_v">
+        <div class="content" id="content_auto_v">overflow-x: auto</div>
+    </div>
+
+    <div class="container classic vertical scroll" id="container_scroll_v">
+        <div class="content" id="content_scroll_v">overflow-x: scroll</div>
+    </div>
+
+    <div class="container classic vertical visible" id="container_visible_v">
+        <div class="content" id="content_visible_v">overflow: visible</div>
+    </div>
+
+    <div class="container classic vertical hidden" id="container_hidden_v">
+        <div class="content" id="content_hidden_v">overflow-x: hidden</div>
+    </div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-004.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-004.html
new file mode 100644
index 00000000000..2f9ac9b7f33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-004.html
@@ -0,0 +1,187 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter: stable both (classic scrollbars)</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+<link rel="help" href="https://www.w3.org/TR/css-overflow-4/#scollbar-gutter-property"/>
+<meta name="assert" content="Test scrollbar-gutter: stable with custom classic scrollbars">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+
+    .container {
+        scrollbar-gutter: stable both;
+        height: 200px;
+        width: 200px;
+        margin: 1px;
+        padding: 0px;
+        border: none;
+        background: deepskyblue;
+    }
+
+    .content {
+        height: 100%;
+        width: 100%;
+        background: lightsalmon;
+    }
+
+    /* ensure that we are using classic scrollbars */
+    .classic {
+        scrollbar-width: 20px;
+        scrollbar-color: hsla(0, 0%, 20%, 0.6) hsla(0, 0%, 40%, 0.3);
+    }
+    .classic::-webkit-scrollbar {
+        width: 20px;
+        height: 20px;
+    }
+    .classic::-webkit-scrollbar-track {
+        background-color: hsla(0, 0%, 40%, 0.4);
+    }
+    .classic::-webkit-scrollbar-thumb {
+        background-color: hsla(0, 0%, 20%, 0.8);
+        border-radius: 10px;
+    }
+
+    /* writing modes */
+    .horizontal {
+        writing-mode: horizontal-tb;
+        overflow-x: auto;
+    }
+    .vertical   {
+        writing-mode: vertical-rl;
+        overflow-y: auto;
+    }
+
+    /* overflow on the block direction */
+    .horizontal.auto    { overflow-y: auto;    }
+    .horizontal.scroll  { overflow-y: scroll;  }
+    .horizontal.visible { overflow:   visible; }
+    .horizontal.hidden  { overflow-y: hidden;  }
+    .vertical.auto      { overflow-x: auto;    }
+    .vertical.scroll    { overflow-x: scroll;  }
+    .vertical.visible   { overflow:   visible; }
+    .vertical.hidden    { overflow-x: hidden;  }
+
+    /* Note: not testing with overflow: clip; */
+
+</style>
+<script type="text/javascript">
+
+    function performTest() {
+        setup({explicit_done: true});
+
+        test(function() {
+            let container = document.getElementById('container_auto_h');
+            let content = document.getElementById('content_auto_h');
+            assert_equals(container.scrollWidth, 160, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 160, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter stable both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_h');
+            let content = document.getElementById('content_scroll_h');
+            assert_equals(container.scrollWidth, 160, "scroll/auto scrollWidth");
+            assert_equals(container.clientWidth, 160, "scroll/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "scroll/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "scroll/auto offsetWidth");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter stable both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_visible_h');
+            let content = document.getElementById('content_visible_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter stable both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_h');
+            let content = document.getElementById('content_hidden_h');
+            assert_equals(container.scrollWidth, 200, "hidden/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "hidden/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "hidden/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "hidden/auto offsetWidth");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter stable both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_auto_v');
+            let content = document.getElementById('content_auto_v');
+            assert_equals(container.scrollHeight, 160, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 160, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter stable both, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_v');
+            let content = document.getElementById('content_scroll_v');
+            assert_equals(container.scrollHeight, 160, "scroll/auto scrollHeight");
+            assert_equals(container.clientHeight, 160, "scroll/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "scroll/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "scroll/auto offsetHeight");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter stable both, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_visible_v');
+            let content = document.getElementById('content_visible_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter stable both, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_v');
+            let content = document.getElementById('content_hidden_v');
+            assert_equals(container.scrollHeight, 200, "hidden/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "hidden/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "hidden/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "hidden/auto offsetHeight");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter stable both, vertical-rl");
+
+        done();
+    }
+
+</script>
+<body onload="performTest()">
+
+    Test scrollbar-gutter: stable both, writing-mode: horizontal-tb
+
+    <div class="container classic horizontal auto" id="container_auto_h">
+        <div class="content" id="content_auto_h">overflow-y: auto</div>
+    </div>
+
+    <div class="container classic horizontal scroll" id="container_scroll_h">
+        <div class="content" id="content_scroll_h">overflow-y: scroll</div>
+    </div>
+
+    <div class="container classic horizontal visible" id="container_visible_h">
+        <div class="content" id="content_visible_h">overflow: visible</div>
+    </div>
+
+    <div class="container classic horizontal hidden" id="container_hidden_h">
+        <div class="content" id="content_hidden_h">overflow-y: hidden</div>
+    </div>
+
+    writing-mode: vertical-rl;
+
+    <div class="container classic vertical auto" id="container_auto_v">
+        <div class="content" id="content_auto_v">overflow-x: auto</div>
+    </div>
+
+    <div class="container classic vertical scroll" id="container_scroll_v">
+        <div class="content" id="content_scroll_v">overflow-x: scroll</div>
+    </div>
+
+    <div class="container classic vertical visible" id="container_visible_v">
+        <div class="content" id="content_visible_v">overflow: visible</div>
+    </div>
+
+    <div class="container classic vertical hidden" id="container_hidden_v">
+        <div class="content" id="content_hidden_v">overflow-x: hidden</div>
+    </div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-005.html b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-005.html
new file mode 100644
index 00000000000..5f1e8413f3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scrollbar-gutter-005.html
@@ -0,0 +1,187 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Overflow: test scrollbar-gutter: always both (classic scrollbars)</title>
+<link rel="author" title="Felipe Erias Morandeira" href="mailto:felipeerias@gmail.com"/>
+<link rel="help" href="https://www.w3.org/TR/css-overflow-4/#scollbar-gutter-property"/>
+<meta name="assert" content="Test scrollbar-gutter: always with custom classic scrollbars">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<style>
+
+    .container {
+        scrollbar-gutter: always both;
+        height: 200px;
+        width: 200px;
+        margin: 1px;
+        padding: 0px;
+        border: none;
+        background: deepskyblue;
+    }
+
+    .content {
+        height: 100%;
+        width: 100%;
+        background: lightsalmon;
+    }
+
+    /* ensure that we are using classic scrollbars */
+    .classic {
+        scrollbar-width: 20px;
+        scrollbar-color: hsla(0, 0%, 20%, 0.6) hsla(0, 0%, 40%, 0.3);
+    }
+    .classic::-webkit-scrollbar {
+        width: 20px;
+        height: 20px;
+    }
+    .classic::-webkit-scrollbar-track {
+        background-color: hsla(0, 0%, 40%, 0.4);
+    }
+    .classic::-webkit-scrollbar-thumb {
+        background-color: hsla(0, 0%, 20%, 0.8);
+        border-radius: 10px;
+    }
+
+    /* writing modes */
+    .horizontal {
+        writing-mode: horizontal-tb;
+        overflow-x: auto;
+    }
+    .vertical   {
+        writing-mode: vertical-rl;
+        overflow-y: auto;
+    }
+
+    /* overflow on the block direction */
+    .horizontal.auto    { overflow-y: auto;    }
+    .horizontal.scroll  { overflow-y: scroll;  }
+    .horizontal.visible { overflow:   visible; }
+    .horizontal.hidden  { overflow-y: hidden;  }
+    .vertical.auto      { overflow-x: auto;    }
+    .vertical.scroll    { overflow-x: scroll;  }
+    .vertical.visible   { overflow:   visible; }
+    .vertical.hidden    { overflow-x: hidden;  }
+
+    /* Note: not testing with overflow: clip; */
+
+</style>
+<script type="text/javascript">
+
+    function performTest() {
+        setup({explicit_done: true});
+
+        test(function() {
+            let container = document.getElementById('container_auto_h');
+            let content = document.getElementById('content_auto_h');
+            assert_equals(container.scrollWidth, 160, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 160, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter always both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_h');
+            let content = document.getElementById('content_scroll_h');
+            assert_equals(container.scrollWidth, 160, "scroll/auto scrollWidth");
+            assert_equals(container.clientWidth, 160, "scroll/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "scroll/auto clientWidth");
+            assert_not_equals(container.offsetWidth, content.offsetWidth, "scroll/auto offsetWidth");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter always both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_visible_h');
+            let content = document.getElementById('content_visible_h');
+            assert_equals(container.scrollWidth, 200, "visible/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "visible/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "visible/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "visible/auto offsetWidth");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter always both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_h');
+            let content = document.getElementById('content_hidden_h');
+            assert_equals(container.scrollWidth, 200, "hidden/auto scrollWidth");
+            assert_equals(container.clientWidth, 200, "hidden/auto clientWidth");
+            assert_equals(container.clientWidth, content.clientWidth, "hidden/auto clientWidth");
+            assert_equals(container.offsetWidth, content.offsetWidth, "hidden/auto offsetWidth");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter always both, horizontal-tb");
+
+        test(function() {
+            let container = document.getElementById('container_auto_v');
+            let content = document.getElementById('content_auto_v');
+            assert_equals(container.scrollHeight, 160, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 160, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow auto, scrollbar-gutter always both, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_scroll_v');
+            let content = document.getElementById('content_scroll_v');
+            assert_equals(container.scrollHeight, 160, "scroll/auto scrollHeight");
+            assert_equals(container.clientHeight, 160, "scroll/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "scroll/auto clientHeight");
+            assert_not_equals(container.offsetHeight, content.offsetHeight, "scroll/auto offsetHeight");
+        }, "Unexpected layout: overflow scroll, scrollbar-gutter always both, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_visible_v');
+            let content = document.getElementById('content_visible_v');
+            assert_equals(container.scrollHeight, 200, "visible/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "visible/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "visible/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "visible/auto offsetHeight");
+        }, "Unexpected layout: overflow visible, scrollbar-gutter always both, vertical-rl");
+
+        test(function() {
+            let container = document.getElementById('container_hidden_v');
+            let content = document.getElementById('content_hidden_v');
+            assert_equals(container.scrollHeight, 200, "hidden/auto scrollHeight");
+            assert_equals(container.clientHeight, 200, "hidden/auto clientHeight");
+            assert_equals(container.clientHeight, content.clientHeight, "hidden/auto clientHeight");
+            assert_equals(container.offsetHeight, content.offsetHeight, "hidden/auto offsetHeight");
+        }, "Unexpected layout: overflow hidden, scrollbar-gutter always both, vertical-rl");
+
+        done();
+    }
+
+</script>
+<body onload="performTest()">
+
+    Test scrollbar-gutter: always both, writing-mode: horizontal-tb
+
+    <div class="container classic horizontal auto" id="container_auto_h">
+        <div class="content" id="content_auto_h">overflow-y: auto</div>
+    </div>
+
+    <div class="container classic horizontal scroll" id="container_scroll_h">
+        <div class="content" id="content_scroll_h">overflow-y: scroll</div>
+    </div>
+
+    <div class="container classic horizontal visible" id="container_visible_h">
+        <div class="content" id="content_visible_h">overflow: visible</div>
+    </div>
+
+    <div class="container classic horizontal hidden" id="container_hidden_h">
+        <div class="content" id="content_hidden_h">overflow-y: hidden</div>
+    </div>
+
+    writing-mode: vertical-rl;
+
+    <div class="container classic vertical auto" id="container_auto_v">
+        <div class="content" id="content_auto_v">overflow-x: auto</div>
+    </div>
+
+    <div class="container classic vertical scroll" id="container_scroll_v">
+        <div class="content" id="content_scroll_v">overflow-x: scroll</div>
+    </div>
+
+    <div class="container classic vertical visible" id="container_visible_v">
+        <div class="content" id="content_visible_v">overflow: visible</div>
+    </div>
+
+    <div class="container classic vertical hidden" id="container_hidden_v">
+        <div class="content" id="content_hidden_v">overflow-x: hidden</div>
+    </div>
+
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset-ref.html b/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset-ref.html
new file mode 100644
index 00000000000..e04afce6ebd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<style>
+  div {
+    background:green;
+    width:50px;
+    height:50px;
+  }
+</style>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset.html b/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset.html
new file mode 100644
index 00000000000..ed17ea91d5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-position/position-absolute-large-negative-inset.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <title>CSS Position: Large negative box inset properties</title>
+  <link rel="help" href="https://drafts.csswg.org/css-position-3/#insets">
+  <link rel="match" href="position-absolute-large-negative-inset-ref.html">
+  <meta name="assert" content="This test verifies a box with very large negative insets within an element with will-change: transform does not affect the rendering of the element."/>
+
+  <style>
+  html {
+    will-change: transform;
+  }
+
+  span {
+    position: absolute;
+    left: -99999999999px;
+  }
+
+  div {
+    background:green;
+    width:50px;
+    height:50px;
+  }
+  </style>
+  <div></div>
+  <span>negative inset text</span>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html b/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html
new file mode 100644
index 00000000000..024bf032d77
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<div style="width: 200px; height: 100px; background: green"></div>
+<div style="height: 4900px"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed.html b/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed.html
new file mode 100644
index 00000000000..64586a207ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-position/position-fixed-scroll-nested-fixed.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>CSS Position: Nested position:fixed in a scrollable position:fixed</title>
+<link rel="help" href="https://www.w3.org/TR/css-position-3/#fixed-position">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=956203">
+<link rel="match" href="position-fixed-scroll-nested-fixed-ref.html">
+<meta name="assert" content="The nested position:fixed element should be above its parent, as if it was a sibling.">
+<div id="outer" style="position: fixed; width: 100px; height: 100px; overflow: auto; background: red">
+  <div style="position: fixed; width: 200px; height: 100px; background: green"></div>
+  <div style="height: 500px"></div>
+</div>
+<div style="height: 5000px"></div>
+<script>
+outer.scrollTop = 200;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-031.html b/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-031.html
index 387bb82082f..e5c68814526 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-031.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-031.html
@@ -15,7 +15,7 @@
     {
       color: red;
       float: left;
-      font-size: 48px;
+      font-size: 32px;
       margin-left: 16px;
     }
 
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-001.tentative.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-001.tentative.html
deleted file mode 100644
index 99c67dee5d9..00000000000
--- a/tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-001.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<title>::file-chooser-button allows to customize the button in &lt;input type=file&gt;</title>
-<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5049">
-<link rel="mismatch" href="file-chooser-button-001-notref.html">
-<style>
-  input::file-chooser-button {
-    background: green;
-    color: white;
-  }
-</style>
-<input type="file">
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-001-notref.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001-notref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-001-notref.html
rename to tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001-notref.html
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.tentative.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.tentative.html
new file mode 100644
index 00000000000..48b2852de82
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-001.tentative.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>::file-selector-button allows to customize the button in &lt;input type=file&gt;</title>
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5049">
+<link rel="mismatch" href="file-selector-button-001-notref.html">
+<style>
+  input::file-selector-button {
+    background: green;
+    color: white;
+  }
+</style>
+<input type="file">
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-display-toggle-crash.tentative.html b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.tentative.html
similarity index 70%
rename from tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-display-toggle-crash.tentative.html
rename to tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.tentative.html
index 4e43609bee8..bc9f24ae019 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/file-chooser-button-display-toggle-crash.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/file-selector-button-display-toggle-crash.tentative.html
@@ -1,8 +1,8 @@
 <!doctype html>
-<title>Shouldn't assert when re-creating a ::file-chooser-button pseudo-element after it being display: none</title>
+<title>Shouldn't assert when re-creating a ::file-selector-button pseudo-element after it being display: none</title>
 <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5049">
 <style>
-  .tweak::file-chooser-button {
+  .tweak::file-selector-button {
     display: none;
   }
 </style>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023-ref.html
new file mode 100644
index 00000000000..d0ce5c1fad7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference: ::marker pseudo elements styled with 'content' property</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<style>
+.disc {
+  list-style-type: disc;
+}
+.decimal {
+  list-style-type: decimal;
+}
+.string {
+  list-style-type: "3. ";
+}
+.content::marker {
+  content: "4. ";
+}
+.rtl-marker ::marker {
+  direction: rtl;
+}
+</style>
+<ol>
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
+<ol class="rtl-marker">
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023.html
new file mode 100644
index 00000000000..9ec0ca46e42
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-content-023.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: ::marker pseudo elements styled with 'content' property</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="match" href="marker-content-023-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text/#text-indent-property">
+<meta name="assert" content="Checks that 'text-indent' doesn't apply nor inherit to ::marker.">
+<style>
+li {
+  text-indent: 100px; /* Should not be inherited by ::marker */
+}
+::marker {
+  text-indent: 100px; /* Should have no effect */
+}
+li > div {
+  text-indent: 0;
+}
+.disc {
+  list-style-type: disc;
+}
+.decimal {
+  list-style-type: decimal;
+}
+.string {
+  list-style-type: "3. ";
+}
+.content::marker {
+  content: "4. ";
+}
+.rtl-marker ::marker {
+  direction: rtl;
+}
+</style>
+<ol>
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
+<ol class="rtl-marker">
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
index 865a2d01a99..0f988d8eb06 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-default-styles.html
@@ -11,7 +11,11 @@
 .decimal { list-style-type: decimal }
 .string { list-style-type: "string" }
 .marker::marker { content: "marker" }
-li { text-transform: lowercase }
+li {
+  /* These inheritable properties should not be inherited by ::marker */
+  text-transform: lowercase;
+  text-indent: 1px;
+}
 </style>
 <div id="log"></div>
 <ul>
@@ -32,6 +36,7 @@ const defaultStyles = [
   ["unicode-bidi", "isolate"],
   ["font-variant-numeric", "tabular-nums"],
   ["text-transform", "none"],
+  ["text-indent", "0px"],
 ];
 for (const target of document.querySelectorAll("li")) {
   const cs = getComputedStyle(target, "::marker");
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens-ref.html
new file mode 100644
index 00000000000..3f29ce441ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens-ref.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+li {
+  width: 0;
+  list-style-type: none;
+}
+</style>
+<ol>
+  <li>foo&shy;bar</li>
+  <li>foo&shy;bar</li>
+</ol>
+<ol>
+  <li>foo&shy;bar</li>
+  <li>foo&shy;bar</li>
+</ol>
+<ol>
+  <li>foobar</li>
+  <li>foobar</li>
+</ol>
+<ol>
+  <li>foobar</li>
+  <li>foobar</li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens.html
new file mode 100644
index 00000000000..a63e3deaf9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-hyphens.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'hyphens'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#hyphenation">
+<link rel="match" href="marker-hyphens-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'hyphens', both explicitly set or inherited from an ancestor">
+<style>
+li {
+  list-style-position: inside;
+  width: 0;
+}
+.hyphens-manual.explicit ::marker,
+.hyphens-manual.inherit {
+  hyphens: manual;
+}
+.hyphens-none.explicit ::marker,
+.hyphens-none.inherit {
+  hyphens: none;
+}
+.marker-string {
+  list-style-type: "foo\AD bar";
+}
+.marker-content::marker {
+  content: "foo\AD bar";
+}
+</style>
+<ol class="hyphens-manual explicit">
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="hyphens-manual inherit">
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="hyphens-none explicit">
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="hyphens-none inherit">
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-001.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-001.html
new file mode 100644
index 00000000000..e5f4aedfba7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-001.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: "2 . \A0 ";
+}
+.marker-string {
+  list-style-type: "X p";
+}
+.marker-content::marker {
+  content: "X p p";
+}
+</style>
+<div class="inside">
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-002.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-002.html
new file mode 100644
index 00000000000..b4022699063
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing-ref-002.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: "2 . \A0  ";
+}
+.marker-string {
+  list-style-type: "X p ";
+}
+.marker-content::marker {
+  content: "X p p ";
+}
+</style>
+<div class="inside">
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing.html
new file mode 100644
index 00000000000..8a89e179215
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-letter-spacing.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'letter-spacing'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#letter-spacing-property">
+<!-- It's unclear whether letter-spacing should add trailing spacing (https://github.com/w3c/csswg-drafts/issues/1518).
+     The 1st reference assumes no trailing spacing, the 2nd one does. -->
+<link rel="match" href="marker-letter-spacing-ref-001.html">
+<link rel="match" href="marker-letter-spacing-ref-002.html">
+<meta name="assert" content="Checks that ::marker supports 'letter-spacing', both explicitly set or inherited from an ancestor">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.letter-spacing.explicit ::marker,
+.letter-spacing.inherit {
+  letter-spacing: 25px;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "Xp";
+}
+.marker-content::marker {
+  content: "Xpp";
+}
+</style>
+<div class="inside">
+  <ol class="letter-spacing explicit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol class="letter-spacing inherit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol class="letter-spacing explicit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol class="letter-spacing inherit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break-ref.html
new file mode 100644
index 00000000000..75625c1ea28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+ul {
+  float: left;
+  width: 50px;
+  list-style-position: inside;
+}
+</style>
+<ul>
+  <li><br>2.<br>ab<br>cd</li>
+</ul>
+<ul>
+  <li><br>2.<br>ab<br>cd</li>
+</ul>
+<ul>
+  <li><br>2<br>.<br>a<br>b<br>c<br>d</li>
+</ul>
+<ul>
+  <li><br>2<br>.<br>a<br>b<br>c<br>d</li>
+</ul>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break.html
new file mode 100644
index 00000000000..7577822bce3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-line-break.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'line-break'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#line-break-property">
+<link rel="match" href="marker-line-break-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'line-break', both explicitly set or inherited from an ancestor">
+<style>
+ol {
+  float: left;
+  width: 50px;
+}
+li {
+  list-style-position: inside;
+  width: 0;
+}
+.line-break-strict.explicit ::marker,
+.line-break-strict.inherit {
+  line-break: strict;
+}
+.line-break-anywhere.explicit ::marker,
+.line-break-anywhere.inherit {
+  line-break: anywhere;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "ab";
+}
+.marker-content::marker {
+  content: "cd";
+}
+</style>
+<ol class="line-break-strict explicit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="line-break-strict inherit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="line-break-anywhere explicit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="line-break-anywhere inherit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-overflow-wrap.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-overflow-wrap.html
new file mode 100644
index 00000000000..29d9cf77849
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-overflow-wrap.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'overflow-wrap'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
+<link rel="match" href="marker-line-break-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'overflow-wrap', both explicitly set or inherited from an ancestor">
+<style>
+ol {
+  float: left;
+  width: 50px;
+}
+li {
+  list-style-position: inside;
+  width: 0;
+}
+.overflow-wrap-normal.explicit ::marker,
+.overflow-wrap-normal.inherit {
+  overflow-wrap: strict;
+}
+.overflow-wrap-anywhere.explicit ::marker,
+.overflow-wrap-anywhere.inherit {
+  overflow-wrap: anywhere;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "ab";
+}
+.marker-content::marker {
+  content: "cd";
+}
+</style>
+<ol class="overflow-wrap-normal explicit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="overflow-wrap-normal inherit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="overflow-wrap-anywhere explicit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="overflow-wrap-anywhere inherit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size-ref.html
new file mode 100644
index 00000000000..2985ac2eeba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size-ref.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.marker-string {
+  list-style-type: "X p";
+}
+.marker-content::marker {
+  content: "X p p";
+}
+</style>
+<div class="inside">
+  <ol>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size.html
new file mode 100644
index 00000000000..a521f58bc80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-tab-size.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'tab-size'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#propdef-tab-size">
+<link rel="match" href="marker-tab-size-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'tab-size', both explicitly set or inherited from an ancestor">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.tab-size.explicit ::marker,
+.tab-size.inherit {
+  tab-size: 1;
+}
+.marker-string {
+  list-style-type: "X\9p";
+}
+.marker-content::marker {
+  content: "X\9p\9p";
+}
+</style>
+<div class="inside">
+  <ol class="tab-size explicit">
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol class="tab-size inherit">
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol class="tab-size explicit">
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol class="tab-size inherit">
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-ref.html
new file mode 100644
index 00000000000..2355fab2e7e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align-ref.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference: ::marker pseudo elements styled with 'text-align' property</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<style>
+li {
+  /* Should not be inherited by ::marker */
+  text-align: end;
+  text-align-all: end;
+  text-align-last: end;
+}
+::marker {
+  /* Should have no effect */
+  text-align: end;
+  text-align-all: end;
+  text-align-last: end;
+}
+li > div {
+  text-align: initial;
+  text-align-all: initial;
+  text-align-last: initial;
+}
+ol {
+  padding-left: 13ch;
+}
+li {
+  line-height: 16px;
+  height: 32px;
+  white-space: pre;
+}
+.disc {
+  list-style-type: disc;
+}
+.decimal {
+  list-style-type: decimal;
+}
+.string {
+  list-style-type: "[m]\a longtext";
+}
+.content::marker {
+  content: "[m]\a longtext";
+}
+.rtl-marker ::marker {
+  direction: rtl;
+}
+</style>
+<ol>
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
+<ol class="rtl-marker">
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align.html
new file mode 100644
index 00000000000..c5f8ed3a201
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-align.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Test: ::marker pseudo elements styled with 'text-align' property</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="match" href="marker-text-align-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text/#text-align-property">
+<meta name="assert" content="Checks that 'text-align' doesn't apply nor inherit to ::marker.">
+<style>
+li {
+  /* Should not be inherited by ::marker */
+  text-align: start;
+  text-align-all: start;
+  text-align-last: start;
+}
+::marker {
+  /* Should have no effect */
+  text-align: start;
+  text-align-all: start;
+  text-align-last: start;
+}
+li > div {
+  text-align: initial;
+  text-align-all: initial;
+  text-align-last: initial;
+}
+ol {
+  padding-left: 13ch;
+}
+li {
+  line-height: 16px;
+  height: 32px;
+  white-space: pre;
+}
+.disc {
+  list-style-type: disc;
+}
+.decimal {
+  list-style-type: decimal;
+}
+.string {
+  list-style-type: "[m]\a longtext";
+}
+.content::marker {
+  content: "[m]\a longtext";
+}
+.rtl-marker ::marker {
+  direction: rtl;
+}
+</style>
+<ol>
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
+<ol class="rtl-marker">
+  <li class="disc"><div>disc</div></li>
+  <li class="decimal"><div>decimal</div></li>
+  <li class="string"><div>string</div></li>
+  <li class="content"><div>content</div></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html
new file mode 100644
index 00000000000..9bf2cf2f50b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+ol {
+  float: left;
+  width: 50px;
+  list-style: none;
+  text-decoration: underline;
+}
+.text-decoration-skip-ink-auto {
+  text-decoration-skip-ink: auto;
+}
+.text-decoration-skip-ink-none {
+  text-decoration-skip-ink: none;
+}
+</style>
+<ol class="text-decoration-skip-ink-auto">
+  <li>g. </li>
+  <li>p. </li>
+  <li>q. </li>
+</ol>
+<ol class="text-decoration-skip-ink-auto">
+  <li>g. </li>
+  <li>p. </li>
+  <li>q. </li>
+</ol>
+<ol class="text-decoration-skip-ink-none">
+  <li>g. </li>
+  <li>p. </li>
+  <li>q. </li>
+</ol>
+<ol class="text-decoration-skip-ink-none">
+  <li>g. </li>
+  <li>p. </li>
+  <li>q. </li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink.html
new file mode 100644
index 00000000000..153e9221a39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-decoration-skip-ink.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'text-decoration-skip-ink'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-skip-ink-property">
+<link rel="match" href="marker-text-decoration-skip-ink-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'text-decoration-skip-ink', both explicitly set or inherited from an ancestor">
+<style>
+ol {
+  float: left;
+  width: 50px;
+  list-style-position: inside;
+  text-decoration: underline;
+}
+.text-decoration-skip-ink-auto.explicit ::marker,
+.text-decoration-skip-ink-auto.inherit {
+  text-decoration-skip-ink: auto;
+}
+.text-decoration-skip-ink-none.explicit ::marker,
+.text-decoration-skip-ink-none.inherit {
+  text-decoration-skip-ink: none;
+}
+.marker-alpha {
+  list-style-type: lower-alpha;
+}
+.marker-string {
+  list-style-type: "p. ";
+}
+.marker-content::marker {
+  content: "q. ";
+}
+</style>
+<ol class="text-decoration-skip-ink-auto explicit">
+  <li class="marker-alpha" value="7"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-decoration-skip-ink-auto inherit">
+  <li class="marker-alpha" value="7"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-decoration-skip-ink-none explicit">
+  <li class="marker-alpha" value="7"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-decoration-skip-ink-none inherit">
+  <li class="marker-alpha" value="7"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis-ref.html
new file mode 100644
index 00000000000..aad3614c693
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis-ref.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+ol {
+  float: left;
+  width: 50px;
+  list-style: none;
+}
+.text-emphasis-shorthand {
+  -webkit-text-emphasis: circle green;
+  text-emphasis: circle green;
+}
+.text-emphasis-longhands {
+  -webkit-text-emphasis-style: circle;
+  -webkit-text-emphasis-color: green;
+  -webkit-text-emphasis-position: under right;
+  text-emphasis-style: circle;
+  text-emphasis-color: green;
+  text-emphasis-position: under right;
+}
+</style>
+<ol class="text-emphasis-shorthand">
+  <li>1. </li>
+  <li>2. </li>
+  <li>3. </li>
+</ol>
+<ol class="text-emphasis-shorthand">
+  <li>1. </li>
+  <li>2. </li>
+  <li>3. </li>
+</ol>
+<ol class="text-emphasis-longhands">
+  <li>1. </li>
+  <li>2. </li>
+  <li>3. </li>
+</ol>
+<ol class="text-emphasis-longhands">
+  <li>1. </li>
+  <li>2. </li>
+  <li>3. </li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis.html
new file mode 100644
index 00000000000..db9fb3d5257
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-emphasis.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'text-emphasis'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#emphasis-marks">
+<link rel="match" href="marker-text-emphasis-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'text-emphasis', both explicitly set or inherited from an ancestor">
+<style>
+ol {
+  float: left;
+  width: 50px;
+  list-style-position: inside;
+}
+.text-emphasis-shorthand.explicit ::marker,
+.text-emphasis-shorthand.inherit {
+  -webkit-text-emphasis: circle green;
+  text-emphasis: circle green;
+}
+.text-emphasis-longhands.explicit ::marker,
+.text-emphasis-longhands.inherit {
+  -webkit-text-emphasis-style: circle;
+  -webkit-text-emphasis-color: green;
+  -webkit-text-emphasis-position: under right;
+  text-emphasis-style: circle;
+  text-emphasis-color: green;
+  text-emphasis-position: under right;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "2. ";
+}
+.marker-content::marker {
+  content: "3. ";
+}
+</style>
+<ol class="text-emphasis-shorthand explicit">
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-emphasis-shorthand inherit">
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-emphasis-longhands explicit">
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-emphasis-longhands inherit">
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow-ref.html
new file mode 100644
index 00000000000..62627d64b7b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+ol {
+  float: left;
+  width: 50px;
+  list-style: none;
+  text-shadow: #0f0 1px 2px 3px;
+}
+</style>
+<ol>
+  <li>1. </li>
+  <li>2. </li>
+  <li>3. </li>
+</ol>
+<ol>
+  <li>1. </li>
+  <li>2. </li>
+  <li>3. </li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow.html
new file mode 100644
index 00000000000..3f8ae566f16
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-text-shadow.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'text-shadow'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-shadow-property">
+<link rel="match" href="marker-text-shadow-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'text-shadow', both explicitly set or inherited from an ancestor">
+<style>
+ol {
+  float: left;
+  width: 50px;
+  list-style-position: inside;
+}
+.text-shadow.explicit ::marker,
+.text-shadow.inherit {
+  text-shadow: #0f0 1px 2px 3px;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "2. ";
+}
+.marker-content::marker {
+  content: "3. ";
+}
+</style>
+<ol class="text-shadow explicit">
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="text-shadow inherit">
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break-ref.html
new file mode 100644
index 00000000000..683eaf1c7f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<style>
+ul {
+  float: left;
+  width: 50px;
+  list-style-position: inside;
+}
+</style>
+<ul>
+  <li><br>2.<br>ab<br>cd</li>
+</ul>
+<ul>
+  <li><br>2.<br>ab<br>cd</li>
+</ul>
+<ul>
+  <li><br>2.<br>a<br>b<br>c<br>d</li>
+</ul>
+<ul>
+  <li><br>2.<br>a<br>b<br>c<br>d</li>
+</ul>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break.html
new file mode 100644
index 00000000000..4e3aeaebd88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-break.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'word-break'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#word-break-property">
+<link rel="match" href="marker-word-break-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'word-break', both explicitly set or inherited from an ancestor">
+<style>
+ol {
+  float: left;
+  width: 50px;
+}
+li {
+  list-style-position: inside;
+  width: 0;
+}
+.word-break-keep-all.explicit ::marker,
+.word-break-keep-all.inherit {
+  word-break: keep-all;
+}
+.word-break-break-all.explicit ::marker,
+.word-break-break-all.inherit {
+  word-break: break-all;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "ab";
+}
+.marker-content::marker {
+  content: "cd";
+}
+</style>
+<ol class="word-break-keep-all explicit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="word-break-keep-all inherit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="word-break-break-all explicit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
+<ol class="word-break-break-all inherit">
+  <li class="marker-disc"></li>
+  <li class="marker-decimal"></li>
+  <li class="marker-string"></li>
+  <li class="marker-content"></li>
+</ol>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing-ref.html
new file mode 100644
index 00000000000..a81aeee44d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing-ref.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Reftest Reference</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: "2.\A0 \A0 ";
+}
+.marker-string {
+  list-style-type: "X\A0 \A0 p";
+}
+.marker-content::marker {
+  content: "Xp\A0 \A0 p";
+}
+</style>
+<div class="inside">
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol>
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing.html b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing.html
new file mode 100644
index 00000000000..a98f0bd7763
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/marker-word-spacing.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>::marker supports 'word-spacing'</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com" />
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#marker-pseudo">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#word-spacing-property">
+<link rel="match" href="marker-word-spacing-ref.html">
+<meta name="assert" content="Checks that ::marker supports 'word-spacing', both explicitly set or inherited from an ancestor">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+div {
+  float: left;
+  font: 25px/1 Ahem;
+}
+.inside {
+  list-style-position: inside;
+  width: 250px;
+}
+.outside {
+  list-style-position: outside;
+  width: 100px;
+  margin-left: 150px;
+}
+ol {
+  padding: 0;
+}
+.word-spacing.explicit ::marker,
+.word-spacing.inherit {
+  word-spacing: 25px;
+}
+.marker-disc {
+  list-style-type: disc;
+}
+.marker-decimal {
+  list-style-type: decimal;
+}
+.marker-string {
+  list-style-type: "X p";
+}
+.marker-content::marker {
+  content: "Xp p";
+}
+</style>
+<div class="inside">
+  <ol class="word-spacing explicit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol class="word-spacing inherit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
+<div class="outside">
+  <ol class="word-spacing explicit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+  <ol class="word-spacing inherit">
+    <li class="marker-disc">É</li>
+    <li class="marker-decimal">É</li>
+    <li class="marker-string">É</li>
+    <li class="marker-content">É</li>
+  </ol>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html
index bc26e202696..5f7dab7a8bf 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties-in-animation.html
@@ -158,13 +158,93 @@ const interpolationTests = [
     midPoint: "\"bar\"",
   },
 
-  // ::marker supports `text-transform`
+  // ::marker supports text properties.
+  {
+    property: "hyphens",
+    from: "manual",
+    to: "none",
+    midPoint: "none",
+  },
+  {
+    property: "letter-spacing",
+    from: "0px",
+    to: "20px",
+    midPoint: "10px",
+  },
+  {
+    property: "line-break",
+    from: "strict",
+    to: "anywhere",
+    midPoint: "anywhere",
+  },
+  {
+    property: "overflow-wrap",
+    from: "break-word",
+    to: "anywhere",
+    midPoint: "anywhere",
+  },
+  {
+    property: "tab-size",
+    from: "0px",
+    to: "20px",
+    midPoint: "10px",
+  },
   {
     property: "text-transform",
     from: "lowercase",
     to: "uppercase",
     midPoint: "uppercase",
   },
+  {
+    property: "word-break",
+    from: "break-all",
+    to: "break-word",
+    midPoint: "break-word",
+  },
+  {
+    property: "word-spacing",
+    from: "0px",
+    to: "20px",
+    midPoint: "10px",
+  },
+
+  // ::marker supports inherited text decoration properties.
+  {
+    property: "text-decoration-skip-ink",
+    from: "auto",
+    to: "none",
+    midPoint: "none",
+  },
+  {
+    property: "text-emphasis",
+    from: "dot rgb(0, 200, 0)",
+    to: "triangle rgb(100, 0, 200)",
+    midPoint: "triangle rgb(50, 100, 100)",
+  },
+  {
+    property: "text-emphasis-color",
+    from: "rgb(0, 200, 0)",
+    to: "rgb(100, 0, 200)",
+    midPoint: "rgb(50, 100, 100)",
+  },
+  {
+    property: "text-emphasis-position",
+    from: "over right",
+    to: "under left",
+    midPoint: "under left",
+  },
+  {
+    property: "text-emphasis-style",
+    from: "dot",
+    to: "triangle",
+    midPoint: "triangle",
+  },
+  {
+    property: "text-shadow",
+    from: "rgb(0, 200, 0) 1px 2px 3px",
+    to: "rgb(100, 0, 200) 3px 2px 1px",
+    midPoint: "rgb(50, 100, 100) 2px 2px 2px",
+  },
 
   // ::marker does NOT support layout properties
   {
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html
index 669d040671b..15a4e894ff3 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/parsing/marker-supported-properties.html
@@ -63,8 +63,23 @@ test_pseudo_computed_value("::marker", "transition-duration", "2s");
 test_pseudo_computed_value("::marker", "transition-property", "display");
 test_pseudo_computed_value("::marker", "transition-timing-function", "linear");
 
-// ::marker supports `text-transform`
+// ::marker supports text properties.
+test_pseudo_computed_value("::marker", "hyphens", "none");
+test_pseudo_computed_value("::marker", "letter-spacing", "10px");
+test_pseudo_computed_value("::marker", "line-break", "anywhere");
+test_pseudo_computed_value("::marker", "overflow-wrap", "anywhere");
+test_pseudo_computed_value("::marker", "tab-size", "10px");
 test_pseudo_computed_value("::marker", "text-transform", "uppercase");
+test_pseudo_computed_value("::marker", "word-break", "break-word");
+test_pseudo_computed_value("::marker", "word-spacing", "10px");
+
+// ::marker supports inherited text decoration properties.
+test_pseudo_computed_value("::marker", "text-decoration-skip-ink", "none");
+test_pseudo_computed_value("::marker", "text-emphasis", "dot rgb(0, 255, 0)");
+test_pseudo_computed_value("::marker", "text-emphasis-color", "rgb(0, 255, 0)");
+test_pseudo_computed_value("::marker", "text-emphasis-position", "under left");
+test_pseudo_computed_value("::marker", "text-emphasis-style", "dot");
+test_pseudo_computed_value("::marker", "text-shadow", "rgb(0, 255, 0) 1px 2px 3px");
 
 // ::marker does NOT support layout properties
 test_pseudo_computed_value("::marker", "display", "none", ["block", "inline", "inline-block"]);
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-dynamic-crash.html b/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-dynamic-crash.html
new file mode 100644
index 00000000000..28ab898a6d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/placeholder-input-dynamic-crash.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<title>Dynamic placeholder attribute changes after addition shouldn't crash</title>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1662483">
+<input type="text">
+<script>
+  let input = document.querySelector("input");
+  input.getBoundingClientRect();
+  input.placeholder = "Foo";
+  input.placeholder = "Bar";
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-031-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-031-ref.html
index 0e3680844f8..7e354e5bc68 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-031-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/active-selection-031-ref.html
@@ -12,7 +12,7 @@
       background-color: yellow;
       color: green;
       float: left;
-      font-size: 48px;
+      font-size: 32px;
       margin-left: 16px;
     }
 
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html
new file mode 100644
index 00000000000..f5a416ecef3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-grammar-001-ref.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+
+ <html lang="en">
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      font-size: 60px;
+      line-height: 90px;
+    }
+
+  div#overlapped-line
+    {
+      color: transparent;
+      margin-bottom: -90px;
+    }
+
+  span#single-word
+    {
+      background-color: yellow;
+    }
+
+  span#overlapping-line
+    {
+      background-color: rgba(0%, 50%, 100%, 0.5);
+      /*
+      a very lite blue color
+      according to
+      https://www.colorhexa.com/7fbfff
+      */
+      color: yellow;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  document.getElementById("reference").blur();
+  /*
+  Some browsers, like Chromium 80+, will
+  transfer focus to a selected element
+  like a contenteditable div and
+  therefore style the border of
+  such element. We remove such
+  focus with the blur() method.
+  */
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>PREREQUISITE: User agent needs to have an enabled and capable grammar error module. If it does not, then this test does not apply to such user agent.
+
+  <p>Test passes
+
+  <ul>
+    <li>if each glyph of the sentence is yellow
+    <li>if "thing" has a desaturated lime green background
+    <li>if the other words have a very lite blue background and
+    <li>if there is no red.
+  </ul>
+
+  <div id="overlapped-line">Many <span id="single-word">thing</span> can happen.</div>
+
+  <div contenteditable="true"><span id="overlapping-line">Many thing can happen.</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html
new file mode 100644
index 00000000000..5dffca9f358
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/reference/selection-overlay-and-spelling-001-ref.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+
+ <html lang="en">
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      font-size: 60px;
+      line-height: 1;
+    }
+
+  span#outer
+    {
+      color: transparent;
+    }
+
+  span#inner
+    {
+      background-color: yellow;
+    }
+
+  div#overlapping-line
+    {
+      margin-top: -60px; /* -1lh unfortunately is not implemented */
+    }
+
+  div#overlapping-line > span
+    {
+      background-color: rgba(0%, 50%, 100%, 0.5);
+      /*
+      a very lite blue color
+      according to
+      https://www.colorhexa.com/7fbfff
+      */
+      color: yellow;
+    }
+  </style>
+
+  <p>PREREQUISITE: User agent needs to have an enabled and capable spelling error module. If it does not, then this test does not apply to such user agent.
+
+  <p>Test passes
+
+  <ul>
+    <li>if each glyph of "Txet sample" is yellow
+    <li>if "Txet" has a desaturated lime green background
+    <li>if " sample" has a very lite blue background and
+    <li>if there is no red.
+  </ul>
+
+  <!--
+  The bad spelling of Txet is intentional and part of this test
+  -->
+
+  <div id="overlapped-line"><span id="outer"><span id="inner">Txet</span> sample</span></div>
+
+  <div id="overlapping-line"><span>Txet sample</span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html
new file mode 100644
index 00000000000..e4fe6e682e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-grammar-001.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+
+ <html lang="en">
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: ::selection overlay drawn over the ::grammar-error overlay</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-painting">
+  <link rel="match" href="reference/selection-overlay-and-grammar-001-ref.html">
+
+  <meta content="" name="flags">
+  <meta name="assert" content="In this test, the div::selection pseudo-element must be drawn over the div::grammar-error overlay.">
+
+  <!--
+
+  The initial version of this test was relying on color
+  composition and was predicting a lime-green-ish (#7FBF80:
+  slightly desaturated lime green) background color for "thing".
+
+  "#7fbf80 color description : Slightly desaturated lime green"
+  https://www.colorhexa.com/7fbf80
+
+  This test does not rely on color composition but the
+  test nevertheless verifies the ::selection overlay drawn
+  over the ::grammar-error overlay.
+
+  -->
+
+  <style>
+  div
+    {
+      font-size: 60px;
+      line-height: 90px;
+    }
+
+  div::selection
+    {
+      background-color: rgba(0%, 50%, 100%, 0.5);
+      /*
+      a very lite blue color
+      according to
+      https://www.colorhexa.com/7fbfff
+      */
+      color: yellow;
+    }
+
+  div::grammar-error
+    {
+      background-color: yellow;
+      color: red;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  var targetRange = document.createRange();
+  /* We first create an empty range */
+  targetRange.selectNodeContents(document.getElementById("test"));
+  /* Then we set the range boundaries to the children of div#test */
+  window.getSelection().addRange(targetRange);
+  /* Finally, we now select such range of content */
+  document.getElementById("test").blur();
+  /*
+  Some browsers, like Chromium 80+, will
+  transfer focus to a selected element
+  like a contenteditable div and
+  therefore style the border of
+  such element. We remove such
+  focus with the blur() method.
+  */
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>PREREQUISITE: User agent needs to have an enabled and capable grammar error module. If it does not, then this test does not apply to such user agent.
+
+  <p>Test passes
+
+  <ul>
+    <li>if each glyph of the sentence is yellow
+    <li>if "thing" has a desaturated lime green background
+    <li>if the other words have a very lite blue background and
+    <li>if there is no red.
+  </ul>
+
+  <div contenteditable="true" id="test">Many thing can happen.</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html
new file mode 100644
index 00000000000..64129ab5f56
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-overlay-and-spelling-001.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+
+ <html lang="en">
+
+  <meta charset="UTF-8">
+
+  <title>CSS Pseudo-Elements Test: ::selection overlay drawn over the ::spelling-error overlay</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-painting">
+  <link rel="match" href="reference/selection-overlay-and-spelling-001-ref.html">
+
+  <meta content="" name="flags">
+  <meta name="assert" content="In this test, the div::selection pseudo-element must be drawn over the div::spelling-error overlay.">
+
+  <!--
+
+  The initial version of this test was relying on color
+  composition and was predicting a lime-green-ish (#7FBF80:
+  slightly desaturated lime green) background color for "Txet".
+
+  "#7fbf80 color description : Slightly desaturated lime green"
+  https://www.colorhexa.com/7fbf80
+
+  This test does not rely on color composition but the
+  test nevertheless verifies the ::selection overlay drawn
+  over the ::grammar-error overlay.
+
+  Chromium 83+'s selection highlight will vertically
+  extend to line box top and bottom... which is
+  under an eventual discussion in
+  https://github.com/w3c/csswg-drafts/issues/5395
+  One easy way to work around this issue
+  would be to set 'line-height' to '1' instead of
+  '90px'.
+
+  -->
+
+  <style>
+  div
+    {
+      font-size: 60px;
+      line-height: 1;
+      /*
+      We deliberately set line-height to 1 in order
+      to avoid/work around a possible difference
+      of rendering of highlight overlay among browsers.
+      In Chrome 80+, the selection highlight
+      overlay will extent vertically to include line
+      box top and line box bottom. This is not
+      the case in Firefox 68+.
+      */
+    }
+
+  div::selection
+    {
+      background-color: rgba(0%, 50%, 100%, 0.5);
+      /*
+      a very lite blue color
+      according to
+      https://www.colorhexa.com/7fbfff
+      */
+      color: yellow;
+    }
+
+  div::spelling-error
+    {
+      background-color: yellow;
+      color: red;
+    }
+  </style>
+
+  <script>
+  function startTest()
+  {
+  var targetRange = document.createRange();
+  /* We first create an empty range */
+  targetRange.selectNodeContents(document.getElementById("test"));
+  /* Then we set the range boundaries to the children of div#test */
+  window.getSelection().addRange(targetRange);
+  /* Finally, we now select such range of content */
+  }
+  </script>
+
+  <body onload="startTest();">
+
+  <p>PREREQUISITE: User agent needs to have an enabled and capable spelling error module. If it does not, then this test does not apply to such user agent.
+
+  <p>Test passes
+
+  <ul>
+    <li>if each glyph of "Txet sample" is yellow
+    <li>if "Txet" has a desaturated lime green background
+    <li>if " sample" has a very lite blue background and
+    <li>if there is no red.
+  </ul>
+
+  <!--
+  The bad spelling of Txet is intentional and part of this test
+  -->
+
+  <div id="test">Txet sample</div>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/focus-prioritized.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/focus-prioritized.html
index 36e3c7644a7..32d90badcad 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/focus-prioritized.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/focus-prioritized.html
@@ -21,7 +21,7 @@ body { height: 4000px }
 <div class=spacer></div>
 <div id=growing></div>
 <div class=spacer></div>
-<div id=focused tabindex=0></div>
+<div id=focused contenteditable></div>
 <div class=spacer></div>
 <div class=spacer></div>
 
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html
new file mode 100644
index 00000000000..1a2d02d5c71
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/flexbox-scrolling-vertical-rl.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  html {
+      writing-mode: vertical-rl;
+      overflow: hidden;
+      background: red;
+  }
+  body {
+      margin: 0;
+  }
+</style>
+<div style="display:flex; flex-direction:column-reverse;">
+  <div style="block-size:1000px;"></div>
+  <div style="block-size:100px; background:green;"></div>
+  <div style="block-size:100px;"></div>
+</div>
+<script>
+  window.scrollTo(-100, 0);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html
new file mode 100644
index 00000000000..1273469dab2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/support/scrolling-vertical-rl.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  html {
+      writing-mode: vertical-rl;
+      overflow: hidden;
+      background: red;
+  }
+  body {
+      margin: 0;
+  }
+</style>
+<div style="block-size:100px;"></div>
+<div style="block-size:100px; background:green;"></div>
+<div style="block-size:1000px;"></div>
+<script>
+  window.scrollTo(-100, 0);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html
new file mode 100644
index 00000000000..ee367b1c971
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-000.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1124195">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  #iframe {
+      display: block;
+      border: none;
+      width: 300px;
+      height: 100px;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<iframe id="iframe" src="support/scrolling-vertical-rl.html"></iframe>
+<script>
+  onload = function() {
+      document.body.offsetTop;
+      iframe.style.width = "100px";
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html
new file mode 100644
index 00000000000..0e58a1e63b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/vertical-rl-viewport-size-change-001.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1124195">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<style>
+  #iframe {
+      display: block;
+      border: none;
+      width: 300px;
+      height: 100px;
+  }
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<iframe id="iframe" src="support/flexbox-scrolling-vertical-rl.html"></iframe>
+<script>
+  onload = function() {
+      document.body.offsetTop;
+      iframe.style.width = "100px";
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-circle.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-circle.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html
index a079d71adbd..d8077c670fe 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-circle.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-circle.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
 <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/">
-<link rel="match" href="float-retry-push-ref.html">
+<link rel="match" href="reference/float-retry-push-ref.html">
 <meta name="flags" content="">
 <meta name="assert" content="Test that a too-wide inline block is pushed in the block direction along a shape-outside circle until it fits.">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-image.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-image.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html
index c88beb38d68..7087797c89d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-image.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-image.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
 <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/">
-<link rel="match" href="float-retry-push-ref.html">
+<link rel="match" href="reference/float-retry-push-ref.html">
 <meta name="flags" content="">
 <meta name="assert" content="Test that a too-wide inline block is pushed in the block direction along a shape-outside image until it fits.">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-inset.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-inset.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html
index 9410ebd3c6b..f24a0e68f4e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-inset.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-inset.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
 <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/">
-<link rel="match" href="float-retry-push-ref.html">
+<link rel="match" href="reference/float-retry-push-ref.html">
 <meta name="flags" content="">
 <meta name="assert" content="Test that a too-wide inline block is pushed in the block direction along a shape-outside inset until it fits.">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-polygon.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-polygon.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html
index f7385f76cab..3471d1b3464 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-polygon.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-retry-push-polygon.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
 <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/">
-<link rel="match" href="float-retry-push-ref.html">
+<link rel="match" href="reference/float-retry-push-ref.html">
 <meta name="flags" content="">
 <meta name="assert" content="Test that a too-wide inline block is pushed in the block direction along a shape-outside polygon until it fits.">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-should-push.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-should-push.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-should-push.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-should-push.html
index c6bcfe576b6..4901b8b5c77 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-should-push.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/float-should-push.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
 <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-shapes-1/">
-<link rel="match" href="float-should-push-ref.html">
+<link rel="match" href="reference/float-should-push-ref.html">
 <meta name="assert" content="Test that a too-wide inline block clear floats defined by shape-outside shapes that don't reach the top of the margin rect.">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-retry-push-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-retry-push-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-should-push-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/float-should-push-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/assorted/reference/float-should-push-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-008-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-009-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-010-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-011-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-border-box-border-radius-012-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-content-box-border-radius-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-003-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-004-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-005-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-006-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-007-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-margin-box-border-radius-008-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/reference/shape-outside-padding-box-border-radius-002-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html
index 86887baff0f..a033c719967 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-001-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html
index f47219e82ec..a4b2cbe3246 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-002.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-002-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html
index 136bc10d205..2ede1bb6539 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-001-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html
index ee48b439ae6..2ee704a7af5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-002.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-002-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html
index 2b537589096..bce4ee51d12 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-003-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-003-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html
index 1a3c72c5d02..0e8cf24fd59 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-004-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-004-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html
index 2c6acebe58c..c76bc98afa6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-005.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-005-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-005-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-bottom-right-radius value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html
index 4f8742ceba3..7303cb13720 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-006.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-006-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-006-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box and border-top-right-radius value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html
index 1a90a08c5fd..0ece2a05183 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-007.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-007-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-007-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-bottom-right-radius value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html
index 59b25c4b610..4dfe5173349 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-008.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-008-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-008-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box and border-top-right-radius value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html
index 9d2a8092c6b..cfee5469bdb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-009.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-009-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-009-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-bottom-right-radius value under sideways-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html
index 280c7e2b6ff..2ddb37bd7f3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-010.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-010-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-010-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box and border-top-right-radius value under sideways-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html
index 34f4c69e69d..acc188d7a1e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-011.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-011-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-011-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the border-box and border-top-right-radius value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html
index 7bf8efe9309..ccacd49d118 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-012.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-border-box-border-radius-012-ref.html">
+  <link rel="match" href="reference/shape-outside-border-box-border-radius-012-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the border-box and border-bottom-right-radius value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html
index d046de02d3c..76a3098c658 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-content-box-001-ref.html">
+  <link rel="match" href="reference/shape-outside-content-box-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the content-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html
index e2040763dfb..bacb7ad0c0c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-002.html
@@ -7,7 +7,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-content-box-002-ref.html">
+  <link rel="match" href="reference/shape-outside-content-box-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the content-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html
index be5591ec6ac..a467bccf336 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-content-box-border-radius-001-ref.html">
+  <link rel="match" href="reference/shape-outside-content-box-border-radius-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the content-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html
index 70c8bc9e2ef..9be47d5ee19 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-content-box-border-radius-002-ref.html">
+  <link rel="match" href="reference/shape-outside-content-box-border-radius-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the content-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html
index 3c0b0fbd6d1..8f6555df360 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-001-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the margin-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html
index e8b71d126c2..6f9cdc02b43 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-002.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-002-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the margin-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html
index dcd26151927..2fbe5d29583 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-001-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the margin-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html
index a49184aa596..6023e6e239a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-002.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-002-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the margin-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html
index 450fe76fc5d..56209027032 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-003-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-003-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the margin-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html
index d4d131bc9e0..33269ae1782 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-004-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-004-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the margin-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html
index 733659c7556..cb7e707b1e6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-005.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-005-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-005-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the margin-box and border-top-right-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html
index 383c0524e9a..4a5beee924e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-006.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-006-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-006-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the margin-box and border-bottom-right-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html
index 95fc114cd70..b1871ed36e3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-007.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-007-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-007-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape in rtl container defined by the margin-box and border-top-right-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html
index a520c1cb2ef..70df0bb243c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-margin-box-border-radius-008-ref.html">
+  <link rel="match" href="reference/shape-outside-margin-box-border-radius-008-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape in ltr container defined by the margin-box and border-top-left-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html
index ff7d15abe8b..74d6227c683 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-padding-box-001-ref.html">
+  <link rel="match" href="reference/shape-outside-padding-box-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the padding-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html
index 4f0d1feea75..a22978f10e0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-002.html
@@ -7,7 +7,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-padding-box-002-ref.html">
+  <link rel="match" href="reference/shape-outside-padding-box-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the padding-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html
index 1b02259de4f..66df1ac59d7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-001.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-padding-box-border-radius-001-ref.html">
+  <link rel="match" href="reference/shape-outside-padding-box-border-radius-001-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the padding-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html
index 59f9400fdc1..8ebb7df2c88 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#shapes-from-box-values">
-  <link rel="match" href="shape-outside-padding-box-border-radius-002-ref.html">
+  <link rel="match" href="reference/shape-outside-padding-box-border-radius-002-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the padding-box and border-radius value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-032-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-033-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-034-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-035-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-036-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-041-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-042-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-047-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-048-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-049-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-050-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-051-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-052-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-053-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-054-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-055-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/reference/shape-outside-circle-056-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html
index d6cadf81d5f..a9f404813ef 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-032.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-032-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-032-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(50% at left top) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html
index 8ce9557a681..9d2b0d89f8e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-033.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-033-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-033-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(50% at right bottom) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html
index 2f8a485a259..c9e978ab1e5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-034.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-034-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-034-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(50% at right top) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html
index 7608bce23f5..348cdd31f2c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-035.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-035-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-035-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(50% at left bottom) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html
index 0c558719d4f..876d2fda485 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-036.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-036-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle() value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html
index 67446b6104c..5cb146b50b6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-037.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-036-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(closest-side at center) border-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html
index 979650c102c..be540c71da4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-038.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-036-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(farthest-side at center) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html
index b120bfcc46f..9b7ae67f75d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-041.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-041-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-041-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape circle(100%) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html
index 3748d1d476f..8e2ee351a83 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-042-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle() value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html
index 200f59ce490..3393a1610a3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-043.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-042-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(closest-side at center) border-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html
index f07985b3d63..ce0f667c544 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-042-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(farthest-side at center) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html
index 450748a098f..a909c152c62 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-047.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-047-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-047-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape circle(100%) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html
index 40cdc8f0116..d6f3e8993b0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-048-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-048-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at left 40px top 40px) value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html
index 150a0e0581f..8f51a7ce146 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-049-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-049-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at left 40px bottom 40px) value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html
index 0a4076211c4..784f70ec870 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-050-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-050-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px top 40px) value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html
index 02290fb8860..d487af8a9cb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-051-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-051-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px bottom 40px) value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html
index eea3695fd91..ad908cf6aaa 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-052.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-052-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-052-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at right 40px bottom 40px) value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html
index 3732605bb98..8e6532d935c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-053.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-053-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-053-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px top 40px) value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html
index fd85c795dd5..4f96f2d67c0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-054.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-054-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-054-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by circle(50% at left 40px bottom 40px) value under horizontal-tb writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html
index 8280c0e8bb0..611984b26f7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-circle-055-ref.html">
+  <link rel="match" href="reference/shape-outside-circle-055-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by circle(50% at right 40px bottom 40px) value under horizontal-tb writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html
index d51cb50447e..f708d1f6282 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-056.html
@@ -7,7 +7,7 @@
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#margin-box">
-        <link rel="match" href="shape-outside-circle-056-ref.html">
+        <link rel="match" href="reference/shape-outside-circle-056-ref.html">
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The test verifies that text wraps around a
                                      left float with a shape-outside defined as
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-032-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-033-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-034-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-035-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-036-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-037-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-038-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-039-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-040-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-042-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-044-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-045-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-046-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-047-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-048-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-049-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-050-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-051-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/reference/shape-outside-ellipse-052-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
index d0c92b9df0b..0917d096c81 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-032.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-032-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-032-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at left top) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html
index 2e2fa577b22..d761a48f072 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-033.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-033-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-033-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(40px 60px at right bottom) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html
index fb4d1331e69..f32747015e8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-034.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-034-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-034-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(40px 60px at right top)">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html
index bc3814a244a..c98eb061e3c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-035.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-035-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-035-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(40px 60px at left bottom) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
index 9a14e65ba25..dd2194ead8f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-036.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-036-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-036-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse() value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
index 6015d2de0dd..70c9a033579 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-037.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-037-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-037-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
index 2d16fae743a..190ae662a93 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-038-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-038-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse() value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
index ca507853390..5a76fbd7628 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-039-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-039-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at right 40px top 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html
index a5b0ce730cb..70db3c0ae37 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-040.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-040-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-040-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape ellipse(0% 0%) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html
index 2050e502dfa..304382ef206 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-041.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-040-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-040-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the left float shape defines an empty float area by the basic shape ellipse(0% 0closest-side closest-side at top left) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html
index 5febab89391..4056a8617d5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-042.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-042-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape ellipse(0% 0%) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html
index 4920dc040d7..3cd8896568f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-043.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-042-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-042-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the right float shape defines an empty float area by the basic shape ellipse(0% 0closest-side closest-side at top right) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html
index 0590b132032..4e5cb542049 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-044.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-044-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-044-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(100% 100%) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html
index 89c786f1abb..0c56b7484e3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-045.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-045-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-045-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(100% 100%) value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html
index 98885fb49b5..cb531521646 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-046.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-046-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-046-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at top 40px right 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html
index 48f49a25aa0..85f8ee4c137 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-047.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-047-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-047-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at top 40px right 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html
index f1b36447b06..5d993266e96 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-048.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-048-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-048-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html
index 5a5919aa663..612ba938d13 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-049.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-049-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-049-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html
index 698cf2d40b6..84371638ea8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-050.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-050-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-050-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html
index b3bf1b960eb..cca37cf9fbd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-051.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-ellipse-051-ref.html">
+  <link rel="match" href="reference/shape-outside-ellipse-051-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the basic shape ellipse(closest-side farthest-side at left 40px top 60px) border-box">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html
index 33f7a8fe34f..25f89533de2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-052.html
@@ -6,7 +6,7 @@
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-ellipse">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
-        <link rel="match" href="shape-outside-ellipse-052-ref.html">
+        <link rel="match" href="reference/shape-outside-ellipse-052-ref.html">
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The test verifies that text wraps around a
                                      left float with a shape-outside defined as
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-016-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-017-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-020-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-021-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-022-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-023-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-024-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-025-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-026-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-027-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html
index 95b5eff0f76..ecf4a9ddf71 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-016.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-016-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-016-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(20px) border-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html
index e936b709cec..7e0f23299ce 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-017.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-017-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-017-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(20px) border-box value.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html
index 786da6c3959..204e4d40c67 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-020.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-020-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-020-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 0 40px/ 0 60px) border-box value under horizontal-tb writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html
index 96b5602f265..218f59cf9d9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-021.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-021-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-021-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 0 40px/ 0 60px) border-box value under horizontal-tb writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html
index 762b53b9e69..69a2d48544f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-022.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-022-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-022-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html
index 5ab5a069dc2..f4d8bd09377 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-023.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-023-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-023-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html
index 6dd122c4b61..d1cfcfbd293 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-024-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-024-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html
index 7b015c33724..40c01941ea8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-025-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-025-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html
index 4beec3f0bd9..6bacd729533 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-026.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-026-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-026-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html
index 3d8d0f5c07e..ca7893c71c0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-027.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-inset-027-ref.html">
+  <link rel="match" href="reference/shape-outside-inset-027-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the inset(10px round 60px 0/ 40px 0) border-box value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-018-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-019-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-020-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-021-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-022-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-023-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-024-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-025-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-032-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html
index b3f63973975..4509c1cb4e4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-018.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-018-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-018-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under horizontal-tb writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html
index af2d0c10a5d..46bb1bf810a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-019.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-019-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-019-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under horizontal-tb writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html
index 2973cd48c7a..127c80a9592 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-020-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-020-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html
index ecc7c878ec2..7698d4ea322 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-021-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-021-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under vertical-rl writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html
index 331fe177cd1..2d8a7e1a63d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-022.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-022-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-022-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html
index 1564ccd6b36..452d1de0f87 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-023.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-023-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-023-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under vertical-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html
index 67290806887..97e4dfa1aac 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-024.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-024-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-024-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the left float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html
index 35db9799b90..318e8cf22a9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-025.html
@@ -8,7 +8,7 @@
   <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
   <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
   <link rel="help" href="https://drafts.csswg.org/css-shapes-1/#supported-basic-shapes">
-  <link rel="match" href="shape-outside-polygon-025-ref.html">
+  <link rel="match" href="reference/shape-outside-polygon-025-ref.html">
   <meta name="flags" content="">
   <meta name="assert" content="Test the boxes are wrapping around the right float shape defined by the polygon(60px 20px, 100px 60px, 20px 60px, 60px 100px) border-box value under sideways-lr writing-mode.">
   <style>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html
rename to tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html
index 6e17492e449..fc1e2edac6a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-032.html
@@ -7,7 +7,7 @@
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
         <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#margin-box">
-        <link rel="match" href="shape-outside-polygon-032-ref.html">
+        <link rel="match" href="reference/shape-outside-polygon-032-ref.html">
         <meta name="flags" content="ahem" />
         <meta name="assert" content="The test verifies that text wraps around a
                                      right float with a shape-outside defined as
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-000.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-000.html
index 487868cee60..850b7c66113 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-000.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-000.html
@@ -27,9 +27,9 @@
             }
         ];
         generate_tests( ParsingUtils.testShapeMarginInlineStyle,
-                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "inline"), false);
+                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "inline"));
         generate_tests( ParsingUtils.testShapeMarginComputedStyle,
-                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "computed"), false);
+                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "computed"));
         </script>
     </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-001.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-001.html
index 28eca1a6baf..d0915830e8d 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-001.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-001.html
@@ -29,11 +29,11 @@
         });
 
         generate_tests( ParsingUtils.testShapeMarginInlineStyle,
-                        ParsingUtils.buildTestCases(shape_margin_valid_unit_tests, "inline"), true);
+                        ParsingUtils.buildTestCases(shape_margin_valid_unit_tests, "inline"));
         ParsingUtils.setupFonts();
         document.fonts.ready.then(()=> {
             generate_tests( ParsingUtils.testShapeMarginComputedStyle,
-                            ParsingUtils.buildTestCases(shape_margin_valid_unit_tests, "computed"), true);
+                            ParsingUtils.buildTestCases(shape_margin_valid_unit_tests, "computed"));
             ParsingUtils.restoreFonts();
             done();
         });
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-002.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-002.html
index 4cb0c69ba78..0618588722a 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-002.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/values/shape-margin-002.html
@@ -37,9 +37,9 @@
             },
         ];
         generate_tests( ParsingUtils.testShapeMarginInlineStyle,
-                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "inline"), true);
+                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "inline"));
         generate_tests( ParsingUtils.testShapeMarginComputedStyle,
-                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "computed"), true);
+                        ParsingUtils.buildTestCases(shape_margin_valid_tests, "computed"));
         </script>
     </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.tentative.html
new file mode 100644
index 00000000000..78a0418fe28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-001.tentative.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: margin-collapsing with aspect-ratio on child element</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="background: green; width: 100px; height: 25px; margin-bottom: -50px;"></div>
+<div style="background: green; width: 100px; margin: 0px;">
+  <div style="margin-top: 50px; margin-bottom: 100px;
+              width: 100px; aspect-ratio: 2/1"></div>
+</div>
+<div style="background: green; width: 100px; height: 25px; margin-top: -100px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.tentative.html
new file mode 100644
index 00000000000..111a6049e5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/block-aspect-ratio-with-margin-collapsing-002.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: margin-collapsing with aspect-ratio on parent element</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css2/#collapsing-margins">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="background: green; width: 100px; height: 25px; margin-bottom: -200px;"></div>
+<div style="background: green; width: 100px; margin: 0px; aspect-ratio: 2/1">
+  <div style="width: 100px; margin-top: 50px; margin-bottom: 200px;"></div>
+</div>
+<div style="background: green; width: 100px; height: 25px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.tentative.html
new file mode 100644
index 00000000000..2c111477e51
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-011.tentative.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: Row flexbox cross size</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#line-sizing" title="9.2.3.B">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: flex; width: 100px;">
+  <div style="background: green; width: 50px; aspect-ratio: 1/1; min-width: 0; flex: 1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.tentative.html
new file mode 100644
index 00000000000..187da3b4262
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-012.tentative.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: Row flexbox cross size</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#line-sizing" title="9.2.3.B">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: flex; width: 100px;">
+  <div style="background: green; aspect-ratio: 1/1; min-width: 0; flex: 1 1 50px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.tentative.html
new file mode 100644
index 00000000000..04933e9b101
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-013.tentative.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: Row flexbox cross size</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#line-sizing" title="9.2.3.B">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: inline-flex; flex-direction: column; height: 100px;">
+  <div style="background: green; aspect-ratio: 1/1; min-height: 0; height: 50px; flex: 1;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.tentative.html
new file mode 100644
index 00000000000..13d1719bf2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/flex-aspect-ratio-014.tentative.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: Row flexbox cross size</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#line-sizing" title="9.2.3.B">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="display: inline-flex; flex-direction: column; height: 100px;">
+  <div style="background: green; aspect-ratio: 1/1; min-height: 0; flex: 1 1 50px;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html
new file mode 100644
index 00000000000..5d8ebce4ec5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/reference/ref-filled-green-100x20-rect.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+
+<div style="background: green; width: 100px; height: 20px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-015.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-015.tentative.html
new file mode 100644
index 00000000000..ee579ea7e9f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-015.tentative.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: svg with viewbox (auto && ratio)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<svg viewBox="0 0 1 1" style="width: 100px; aspect-ratio: auto 5/1; background-color: green;"></svg>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-016.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-016.tentative.html
new file mode 100644
index 00000000000..0ed8330424a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-016.tentative.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: svg without viewbox (auto && ratio)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<svg style="width: 100px; aspect-ratio: auto 1/1; background-color: green;"></svg>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-017.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-017.tentative.html
new file mode 100644
index 00000000000..4947a702d0a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-017.tentative.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>CSS aspect-ratio: canvas</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="reference/ref-filled-green-100x20-rect.html" />
+
+<canvas width=200 height=200 style='width:100px; aspect-ratio:5/1;'></canvas>
+<script>
+  window.onload = function() {
+    const canvas = document.querySelector('canvas');
+    const ctx = canvas.getContext('2d');
+    ctx.fillStyle = 'green';
+    ctx.fillRect(0, 0, 200, 200);
+    document.documentElement.removeAttribute('class');
+  }
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-018.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-018.tentative.html
new file mode 100644
index 00000000000..f26c1f60a88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-018.tentative.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: embed</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<embed type="image/png" src="support/20x50-green.png" style="width: 100px; aspect-ratio: 1/1;">
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-019.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-019.tentative.html
new file mode 100644
index 00000000000..80ff2ccd49c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-019.tentative.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: embed with ratio 5:1</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="reference/ref-filled-green-100x20-rect.html" />
+
+<embed type="image/png" src="support/20x50-green.png" style="width: 100px; aspect-ratio: 5/1;">
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-020.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-020.tentative.html
new file mode 100644
index 00000000000..b2d58ea3d24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-020.tentative.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: SVG object with intrinsic size (auto && ratio)</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<object type="image/svg+xml" data="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1 1' style='background-color: green'%3E%3C/svg%3E"
+        style="width: 100px; aspect-ratio: auto 5/1;"></object>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-021.tentative.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-021.tentative.html
new file mode 100644
index 00000000000..14a2b8eb6d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/replaced-element-021.tentative.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<title>CSS aspect-ratio: SVG object without intrinsic size (auto && ratio)</title>
+<link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#aspect-ratio">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<object type="image/svg+xml" data="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' style='background-color: green'%3E%3C/svg%3E"
+        style="width: 100px; aspect-ratio: auto 1/1;"></object>
diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html b/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html
new file mode 100644
index 00000000000..6a65942e16e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-syntax/charset/page-windows-1252-http-windows-1251-css-utf8-bom.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<title>CSS charset: page windows-1252, CSS-HTTP windows-1251, CSS UTF-8 BOM</title>
+<link rel=help href="https://drafts.csswg.org/css-syntax-3/#determine-the-fallback-encoding">
+<meta charset=windows-1252>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel=stylesheet href="support/utf8-bom-http-windows-1251.css">
+<div id=log></div>
+<div id=&#xfffd;></div>
+<script>
+var elm = document.getElementById('\ufffd');
+var t = async_test();
+onload = t.step_func(function(){
+  assert_equals(getComputedStyle(elm, '').visibility, 'hidden');
+  this.done();
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css b/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css
new file mode 100644
index 00000000000..1dbf5cf2fce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css
@@ -0,0 +1 @@
+#È { visibility:hidden }
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers b/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers
new file mode 100644
index 00000000000..9a67b0fea44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-syntax/charset/support/utf8-bom-http-windows-1251.css.headers
@@ -0,0 +1 @@
+Content-Type: text/css; charset=windows-1251
diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-008.tentative.html b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-008.tentative.html
new file mode 100644
index 00000000000..157139b9ca0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-008.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#abspos">
+<link rel="help" href="https://crbug.com/1122428">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="When sizing abspos tables, the given available-size can never exceed the available-size of the containing-block.">
+<style>
+div {
+  position: relative;
+  width: 100px;
+  height: 100px;
+}
+table {
+  background: green;
+  height: 100px;
+  position: absolute;
+  border-spacing: 0;
+  color: transparent;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div style="margin-left: 100px;">
+  <table style="left: -100px;">
+    <td>X X X X X X X X X</td>
+  </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-009.tentative.html b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-009.tentative.html
new file mode 100644
index 00000000000..291c69afbcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-009.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#abspos">
+<link rel="help" href="https://crbug.com/1122428">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="When sizing abspos tables, the given available-size can never exceed the available-size of the containing-block.">
+<style>
+div {
+  position: relative;
+  width: 100px;
+  height: 100px;
+}
+table {
+  background: green;
+  height: 100px;
+  position: absolute;
+  border-spacing: 0;
+  color: transparent;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div style="margin-left: 100px;">
+  <table style="left: -100px; right: 0;">
+    <td>X X X X X X X X X</td>
+  </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-010.tentative.html b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-010.tentative.html
new file mode 100644
index 00000000000..cb4ad48f3ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-010.tentative.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#abspos">
+<link rel="help" href="https://crbug.com/1122428">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="When sizing abspos tables, the given available-size can never exceed the available-size of the containing-block.">
+<style>
+.container {
+  position: relative;
+  width: 100px;
+  height: 100px;
+}
+table {
+  background: green;
+  height: 100px;
+  position: absolute;
+  border-spacing: 0;
+  color: transparent;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="container" style="margin-left: 100px;">
+  <div style="margin-left: -100px;">
+    <table>
+      <td>X X X X X X X X X</td>
+    </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-011.tentative.html b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-011.tentative.html
new file mode 100644
index 00000000000..5c8ed3a5fa8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-011.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#abspos">
+<link rel="help" href="https://crbug.com/1122428">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="When sizing abspos tables, the given available-size can never exceed the available-size of the containing-block.">
+<style>
+div {
+  position: relative;
+  width: 100px;
+  height: 100px;
+}
+table {
+  background: green;
+  height: 100px;
+  position: absolute;
+  border-spacing: 0;
+  color: transparent;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div style="margin-left: -100px;">
+  <table style="right: -100px;">
+    <td>X X X X X X X X X</td>
+  </table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-012.html b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-012.html
new file mode 100644
index 00000000000..76dc0bf9e88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/absolute-tables-012.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-tables-3/#abspos">
+<link rel="help" href="https://crbug.com/1123475">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="When sizing abspos tables with `table-layout: fixed`, the max-content size shouldn't be infinite.">
+<p>Test passes if there is a filled green square.</p>
+<div style="position: relative; width: 200px;">
+  <table style="position: absolute; width: 50%; height: 100px; table-layout: fixed; background: green;"></table>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html b/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
index 737a8d7e2a8..1bc4a2f6819 100644
--- a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
+++ b/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
@@ -19,39 +19,28 @@
     div input { width: 100px; }
 </style>
 <script>
-    function assertEqualOffsetWidths(a,b) {
-        var desc = document.querySelector('main > hr:last-of-type + p + p') || document.querySelectorAll('main > hr + p + p')[document.querySelectorAll('main > hr + p + p').length-1];
-        var root = document.querySelector('main > div:last-of-type') || document.querySelectorAll('main > div')[document.querySelectorAll('main > div').length-1];
-        generate_tests(assert_equals, [
-            [
-                desc.textContent,
-                root.querySelector("[target="+a+"]").offsetWidth,
-                root.querySelector("[target="+b+"]").offsetWidth
-            ]
-        ]);
-    }
-    function assertEqualOffsetTops(a,b) {
-        var desc = document.querySelector('main > hr:last-of-type + p + p') || document.querySelectorAll('main > hr + p + p')[document.querySelectorAll('main > hr + p + p').length-1];
-        var root = document.querySelector('main > div:last-of-type') || document.querySelectorAll('main > div')[document.querySelectorAll('main > div').length-1];
-        generate_tests(assert_equals, [
-            [
-                desc.textContent,
-                root.querySelector("[target="+a+"]").getBoundingClientRect().top|0,
-                root.querySelector("[target="+b+"]").getBoundingClientRect().top|0
-            ]
-        ]);
-    }
-    function assertUnequalOffsetTops(a,b) {
-        var desc = document.querySelector('main > hr:last-of-type + p + p') || document.querySelectorAll('main > hr + p + p')[document.querySelectorAll('main > hr + p + p').length-1];
-        var root = document.querySelector('main > div:last-of-type') || document.querySelectorAll('main > div')[document.querySelectorAll('main > div').length-1];
-        generate_tests(assert_not_equals, [
-            [
-                desc.textContent,
-                root.querySelector("[target="+a+"]").getBoundingClientRect().top|0,
-                root.querySelector("[target="+b+"]").getBoundingClientRect().top|0
-            ]
-        ]);
-    }
+    window.addEventListener("DOMContentLoaded", function(){
+        var tests = document.getElementsByTagName("hr");
+        for (var i = 0; i < tests.length; i++) {
+            (function(){
+                var desc = tests[i].nextElementSibling.nextElementSibling;
+                var root = desc.nextElementSibling;
+                var t = async_test(desc.textContent);
+                window.addEventListener("load", t.step_func_done(function() {
+                    var a = root.querySelector("[target=a]");
+                    var b = root.querySelector("[target=b]");
+                    var offset = root.getAttribute("offset");
+                    var a_offset = a.getBoundingClientRect()[offset];
+                    var b_offset = b.getBoundingClientRect()[offset];
+                    if (root.hasAttribute("unequal")) {
+                        assert_not_equals(b_offset, a_offset);
+                    } else {
+                        assert_equals(b_offset, a_offset);
+                    }
+                }));
+            })();
+        }
+    });
 </script>
 
 <main>
@@ -62,403 +51,253 @@
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both input fields should look identical, on their own line:</p>
     <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input elements</p>
-    <div>
+    <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><input block target=a /></x-tr>
             <input table-row target=b />
         </x-table>
     </div>
-    <script>
-
-        assertEqualOffsetWidths('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should look identical, on their own line:</p>
     <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- img elements</p>
-    <div>
+    <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><img block src="../support/blue32x32.ico" target=a /></x-tr>
             <img src="../support/blue32x32.ico" table-row target=b />
         </x-table>
     </div>
-    <script>
-
-        assertEqualOffsetWidths('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both input fields should look identical, on their own line:</p>
     <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- input elements</p>
-    <div>
+    <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><input inline target=a /></x-tr>
             <input table-column target=b />
         </x-table>
     </div>
-    <script>
-
-        assertEqualOffsetWidths('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should look identical, on their own line:</p>
     <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements</p>
-    <div>
+    <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><img inline src="../support/blue32x32.ico" target=a /></x-tr>
             <img src="../support/blue32x32.ico" table-column target=b />
         </x-table>
     </div>
-    <script>
-
-        assertEqualOffsetWidths('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both input fields should look identical, on their own line:</p>
     <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input elements</p>
-    <div>
+    <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><input inline target=a /></x-tr>
             <x-tr><input table-cell target=b /></x-tr>
         </x-table>
     </div>
-    <script>
-
-        assertEqualOffsetWidths('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should look identical, on their own line:</p>
     <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements</p>
-    <div>
+    <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><img inline src="../support/blue32x32.ico" target=a /></x-tr>
             <x-tr><img src="../support/blue32x32.ico" table-cell target=b /></x-tr>
         </x-table>
     </div>
-    <script>
-
-        assertEqualOffsetWidths('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are <mark>considered</mark> inline -- input=text elements</p>
-    <div>
+    <div offset=top>
         <input inline-table target=a />
         <input inline-table target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both button inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are considered <mark>inline</mark> -- input=button elements</p>
-    <div>
+    <div offset=top>
         <input type=button inline-table target=a />
         <input type=button inline-table target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both file inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are considered <mark>inline</mark> -- input=file elements</p>
-    <div>
+    <div offset=top>
         <input type=file inline-table target=a />
         <input type=file inline-table target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are considered <mark>inline</mark> -- img elements</p>
-    <div>
+    <div offset=top>
         <img src="../support/blue32x32.ico" inline-table target=a />
         <img src="../support/blue32x32.ico" inline-table target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table</mark> and are considered <mark>block</mark> -- input=text elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=text table target=a />
         <input type=text table target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both button inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table</mark> and are considered <mark>block</mark> -- input=button elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=button table target=a />
         <input type=button table target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both file inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table</mark> and are considered <mark>block</mark> -- input=file elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=file table target=a />
         <input type=file table target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table</mark> and are considered <mark>block</mark> -- img elements</p>
-    <div>
+    <div offset=top unequal>
         <img src="../support/blue32x32.ico" table target=a />
         <img src="../support/blue32x32.ico" table target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input=text elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=text table-row target=a />
         <input type=text table-row target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both button inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input=button elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=button table-row target=a />
         <input type=button table-row target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both file inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input=file elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=file table-row target=a />
         <input type=file table-row target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- img elements</p>
-    <div>
+    <div offset=top unequal>
         <img src="../support/blue32x32.ico" table-row target=a />
         <img src="../support/blue32x32.ico" table-row target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- input=text elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=text table-row-group target=a />
         <input type=text table-row-group target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both button inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- input=button elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=button table-row-group target=a />
         <input type=button table-row-group target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both file inputs should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- input=file elements</p>
-    <div>
+    <div offset=top unequal>
         <input type=file table-row-group target=a />
         <input type=file table-row-group target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should stand on their own line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- img elements</p>
-    <div>
+    <div offset=top unequal>
         <img src="../support/blue32x32.ico" table-row-group target=a />
         <img src="../support/blue32x32.ico" table-row-group target=b />
     </div>
-    <script>
-
-        assertUnequalOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are <mark>considered</mark> inline -- input=text elements</p>
-    <div>
+    <div offset=top>
         <input table-column target=a />
         <input table-column target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both button inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- input=button elements</p>
-    <div>
+    <div offset=top>
         <input type=button table-column target=a />
         <input type=button table-column target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both file inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- input=file elements</p>
-    <div>
+    <div offset=top>
         <input type=file table-column target=a />
         <input type=file table-column target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements</p>
-    <div>
+    <div offset=top>
         <img src="../support/blue32x32.ico" table-column target=a />
         <img src="../support/blue32x32.ico" table-column target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are <mark>considered</mark> inline -- input=text elements</p>
-    <div>
+    <div offset=top>
         <input table-cell target=a />
         <input table-cell target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both button inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input=button elements</p>
-    <div>
+    <div offset=top>
         <input type=button table-cell target=a />
         <input type=button table-cell target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both file inputs should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input=file elements</p>
-    <div>
+    <div offset=top>
         <input type=file table-cell target=a />
         <input type=file table-cell target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should share the same line:</p>
     <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements</p>
-    <div>
+    <div offset=top>
         <img src="../support/blue32x32.ico" table-cell target=a />
         <img src="../support/blue32x32.ico" table-cell target=b />
     </div>
-    <script>
-
-        assertEqualOffsetTops('a','b');
-
-    </script>
 
 </main>
diff --git a/tests/wpt/web-platform-tests/css/css-text/animations/tab-size-interpolation.html b/tests/wpt/web-platform-tests/css/css-text/animations/tab-size-interpolation.html
new file mode 100644
index 00000000000..3cf63782f59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/animations/tab-size-interpolation.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#tab-size-property">
+<meta name="test" content="tab-size supports animation by computed value type">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+.parent {
+  tab-size: 20;
+}
+.target {
+  font: 10px sans-serif;
+  tab-size: 5;
+}
+.expected {
+  color: green;
+}
+</style>
+
+<body>
+  <template id="target-template">T</template>
+</body>
+
+<script>
+test_interpolation({
+  property: 'tab-size',
+  from: neutralKeyframe,
+  to: 10,
+}, [
+  {at: -0.3, expect: '3.5'},
+  {at: 0, expect: '5'},
+  {at: 0.3, expect: '6.5'},
+  {at: 0.6, expect: '8'},
+  {at: 1, expect: '10'},
+  {at: 1.5, expect: '12.5'},
+]);
+
+test_interpolation({
+  property: 'tab-size',
+  from: 'initial',
+  to: 10,
+}, [
+  {at: -0.3, expect: '7.4'},
+  {at: 0, expect: '8'},
+  {at: 0.3, expect: '8.6'},
+  {at: 0.6, expect: '9.2'},
+  {at: 1, expect: '10'},
+  {at: 1.5, expect: '11'},
+]);
+
+test_interpolation({
+  property: 'tab-size',
+  from: 'inherit',
+  to: 10,
+}, [
+  {at: -0.3, expect: '23'},
+  {at: 0, expect: '20'},
+  {at: 0.3, expect: '17'},
+  {at: 0.6, expect: '14'},
+  {at: 1, expect: '10'},
+  {at: 1.5, expect: '5'},
+]);
+
+test_interpolation({
+  property: 'tab-size',
+  from: 'unset',
+  to: 10,
+}, [
+  {at: -0.3, expect: '23'},
+  {at: 0, expect: '20'},
+  {at: 0.3, expect: '17'},
+  {at: 0.6, expect: '14'},
+  {at: 1, expect: '10'},
+  {at: 1.5, expect: '5'},
+]);
+
+test_interpolation({
+  property: 'tab-size',
+  from: 0,
+  to: 10,
+}, [
+  {at: -0.3, expect: '0'},
+  {at: 0, expect: '0'},
+  {at: 0.3, expect: '3'},
+  {at: 0.6, expect: '6'},
+  {at: 1, expect: '10'},
+  {at: 1.5, expect: '15'},
+]);
+
+test_interpolation({
+  property: 'tab-size',
+  from: 4,
+  to: 10,
+}, [
+  {at: -0.3, expect: '2.2'},
+  {at: 0, expect: '4'},
+  {at: 0.3, expect: '5.8'},
+  {at: 0.6, expect: '7.6'},
+  {at: 1, expect: '10'},
+  {at: 1.5, expect: '13'},
+]);
+
+test_interpolation({
+  property: 'tab-size',
+  from: '1px',
+  to: '10px',
+}, [
+  {at: -0.3, expect: '0px'},
+  {at: 0, expect: '1px'},
+  {at: 0.3, expect: '3.7px'},
+  {at: 0.6, expect: '6.4px'},
+  {at: 1, expect: '10px'},
+  {at: 1.5, expect: '14.5px'},
+]);
+
+test_no_interpolation({
+  property: 'tab-size',
+  from: '1',
+  to: '10px',
+});
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001-ref.html
new file mode 100644
index 00000000000..36347454947
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test reference</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<style>
+div {
+    font-family: monospace;
+}
+</style>
+
+<p>Test passes if the three “A� letters below are vertically aligned with eachother.
+<div class=ref>
+          A<br>
+          A<br>
+          A
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001.html
new file mode 100644
index 00000000000..ecdcfeff010
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-001.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: inline box tab-size</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#tab-size-property">
+<link rel="match" href="tab-size-inline-001-ref.html">
+<meta name="assert" content="tab-size applies to inline boxes">
+<style>
+div {
+    font-family: monospace;
+    white-space: pre;
+    tab-size: 2;
+}
+.t5 {
+    tab-size: 5;
+}
+.t10 {
+    tab-size: 10;
+}
+</style>
+
+<p>Test passes if the three “A� letters below are vertically aligned with eachother.
+
+<div>
+          A
+<span class=t5>&#x09;&#x09;A</span>
+<span class=t10>&#x09;A</span>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002-ref.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002-ref.html
new file mode 100644
index 00000000000..b595b3f9a5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test reference</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<style>
+div {
+    font-family: monospace;
+    white-space: pre;
+    font-size: 2em;
+}
+.wrong { color: orange; }
+.right { color: blue; }
+</style>
+
+<p>Test passes if the black “A� lines up vertically with the blue one, not the orange one.
+
+<div class=right>            A</div>
+
+<div class=right>            A</div>
+<div class=wrong>              A</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002.html
new file mode 100644
index 00000000000..f87c107949a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-inline-002.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: inline box tab-size tab stops</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#tab-size-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="tab-size-inline-002-ref.html">
+<meta name="assert" content="tab-stops are calculated separatey for each tab with a different tab-size, not stacked up somehow">
+<style>
+div {
+    font-family: monospace;
+    white-space: pre;
+    tab-size: 10;
+    font-size: 2em;
+}
+span {
+    tab-size: 4;
+}
+.wrong { color: orange; }
+.right { color: blue; }
+</style>
+
+<p>Test passes if the black “A� lines up vertically with the blue one, not the orange one.
+
+<div>&#x09;<span>&#x09;A</span></div>
+
+<div class=right>            A</div> <!-- 12 = n * 4, such with n such that n*4 > 10 -->
+<div class=wrong>              A</div> <!-- 14 = 10 + 4 -->
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004-ref.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004-ref.html
new file mode 100644
index 00000000000..0f29998d238
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Text Test reference</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.neat">
+<style>
+div {
+    white-space: pre;
+}
+span {
+    font-size: 2em;
+    font-family: monospace;
+}
+</style>
+
+<p>Test passes if the two “X� letters bellow are vertically algined.
+
+<div>    <span>X<span></div>
+<div>    <span>X<span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html
new file mode 100644
index 00000000000..70dc7bf6f8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/tab-size/tab-size-integer-004.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<title>CSS Text Test: tab-size: bloc container</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.neat">
+<link rel="help" href="http://www.w3.org/TR/css-text-3/#tab-size">
+<link rel="match" href="tab-size-integer-004-ref.html">
+<meta name="assert" content="Integer tab sizes are based on the nearest block container ancestor, not on the tab itself">
+<style>
+div {
+    white-space: pre;
+    tab-size: 2; /* Overridden, as tab-size applies to inline boxes */
+}
+span {
+    tab-size: 4;
+
+    /* Various factors that are taken into account in the calculation of the tab size,
+       but do not matter here because it must be calculated based on the block container
+       rather than the inline.
+    */
+    font-size: 2em;
+    font-family: monospace;
+    letter-spacing: 5px;
+    word-spacing: 5px;
+}
+</style>
+
+<p>Test passes if the two “X� letters bellow are vertically algined.
+
+<div><span>&#09;X<span></div>
+<div class=ref>    <span>X<span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html
index 976ce7c639f..b8bcbe17b73 100644
--- a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-001.html
@@ -1,44 +1,46 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text level 3 Test: collapsible white space at end-of-line and bidi</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<title>CSS Text 3 test: trailing collapsible spaces and bidi</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
 <link rel="match" href="reference/eol-spaces-bidi-001-ref.html">
-<meta name="assert" content="Collapsible space at the end of the line prior to bidi reordering are removed.">
+<meta name="assert" content="Space before a line break is removed even if reordered to the middle of line by bidi reordering">
+
 <style>
 div {
-  font-family: monospace;
-  border: solid blue;
-  font-size: 1.5em;
-  margin-bottom:1em;
-  display: inline-block;
+    font-family: monospace;
+    border: solid blue;
+    font-size: 1.5em;
 }
 .ref {
-  white-space: pre;
-  border-color: orange;
+    border-color: orange;
+    white-space: pre;
 }
 .w5 { width: 5ch; }
 .w6 { width: 6ch; }
 .w7 { width: 7ch; }
-.w8 { width: 8ch; }
-
-.blue {	background: #aaaaff; }
-.red {	background: #ffaaaa; }
-.green {	background: #aaffaa; }
-.pink {	background: #ffaaff; }
-.yellow {	background: #ffffaa; }
 
+.blue { background: #aaaaff; }
+.red { background: #ffaaaa; }
+.green { background: #aaffaa; }
+.pink { background: #ffaaff; }
+.yellow { background: #ffffaa; }
 </style>
-<p>Test passes if the content of each blue box (on the left) is laid out identically to the content of the orange box to its right.
+
+<p>Test passes if each pair of blue / orange boxes are identical (except for the color of their border).
 
 <div class=w5><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
-<div class="ref w5">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
-<br>
+
+<div class="w5 ref">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
+
+<hr>
+
 <div class=w6><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
-<div class="ref w6">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
-<br>
+
+<div class="w6 ref">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
+
+<hr>
+
 <div class=w7><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
-<div class="ref w7">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
-<br>
-<div class=w8><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
-<div class="ref w8">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
+
+<div class="w7 ref">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-002.html b/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-002.html
new file mode 100644
index 00000000000..0efba0a363f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/eol-spaces-bidi-002.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text 3 test: trailing pre-wrap spaces and bidi</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="help" href="https://www.w3.org/TR/css-writing-modes/#text-direction">
+<link rel="help" href="http://www.unicode.org/reports/tr9/#L1">
+<link rel="match" href="reference/eol-spaces-bidi-002-ref.html">
+<meta name="assert" content="Use UAX9L1 to determine which space is at the end of the line, taking into account that such spaces, when pre-wrap, must hang.">
+
+<style>
+div {
+    font-family: monospace;
+    border: solid blue;
+    font-size: 1.5em;
+    white-space: pre-wrap;
+}
+.ref {
+    border-color: orange;
+    white-space: pre;
+}
+.w6 { width: 6ch; }
+.w7 { width: 7ch; }
+.w8 { width: 8ch; }
+.w9 { width: 9ch; }
+
+.blue { background: #aaaaff; }
+.red { background: #ffaaaa; }
+.green { background: #aaffaa; }
+.pink { background: #ffaaff; }
+.yellow { background: #ffffaa; }
+</style>
+
+<p>Test passes if each pair of blue / orange boxes are identical (except for the color of their border).
+
+
+<!-- not coloring the space between ا and ب in this particular case,
+   because per UAX9 L1 and css-text-3 4.1.2 point 4 bullet 2:
+   this space MUST be at the end of the line and hang,
+   but also the UA MAY collapse it's advance width.
+   Not giving it a color lets the test pass either way.
+-->
+
+<div class="w6"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span> </span>ب<span class=yellow> </span></div>
+<div class="w6 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<br>ب<span class=yellow> </span></div>
+
+<hr>
+
+<div class="w7"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
+<div class="w7 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span><br>ب<span class=yellow> </span></div>
+
+<hr>
+
+<!-- not coloring the last space in this particular case,
+   because per 4.1.2 point 4 bullet 2:
+   this space MUST hang,
+   but also the UA MAY collapse it's advance width.
+   So we know for sure it won't cause a line break,
+   but it may or may not be visible at the end of the line.
+   Not giving it a color lets the test pass either way.
+-->
+
+<div class="w8"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span> </span></div>
+<div class="w8 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
+
+<hr>
+
+<div class="w9"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
+<div class="w9 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html
index 37da6649f9b..430706c5569 100644
--- a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-001-ref.html
@@ -1,39 +1,38 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS test reference</title>
-<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<title>CSS Text 3 test reference</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+
 <style>
 div {
-  font-family: monospace;
-  border: solid blue;
-  font-size: 1.5em;
-  margin-bottom:1em;
-  display: inline-block;
-  white-space: pre;
+    font-family: monospace;
+    border: solid blue;
+    font-size: 1.5em;
+    white-space: pre;
 }
 .ref {
-  border-color: orange;
+    border-color: orange;
 }
 .w5 { width: 5ch; }
 .w6 { width: 6ch; }
 .w7 { width: 7ch; }
-.w8 { width: 8ch; }
-
-.blue {	background: #aaaaff; }
-.red {	background: #ffaaaa; }
-.green {	background: #aaffaa; }
 
+.blue { background: #aaaaff; }
+.red { background: #ffaaaa; }
+.green { background: #aaffaa; }
 </style>
-<p>Test passes if the content of each blue box (on the left) is laid out identically to the content of the orange box to its right.
+
+<p>Test passes if each pair of blue / orange boxes are identical (except for the color of their border).
 
 <div class="w5">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
-<div class="ref w5">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
-<br>
+<div class="w5 ref">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
+
+<hr>
+
 <div class="w6">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
-<div class="ref w6">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
-<br>
+<div class="w6 ref">A<span class=blue> </span>B<span class=red> </span>ا<br>ب</div>
+
+<hr>
+
 <div class="w7">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
-<div class="ref w7">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
-<br>
-<div class="w8">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
-<div class="ref w8">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
+<div class="w7 ref">A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html
new file mode 100644
index 00000000000..30a4ffd303d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/eol-spaces-bidi-002-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text 3 test reference</title>
+<link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net/">
+
+<style>
+div {
+    font-family: monospace;
+    border: solid blue;
+    font-size: 1.5em;
+    white-space: pre;
+}
+.ref {
+    border-color: orange;
+}
+.w6 { width: 6ch; }
+.w7 { width: 7ch; }
+.w8 { width: 8ch; }
+.w9 { width: 9ch; }
+
+.blue { background: #aaaaff; }
+.red { background: #ffaaaa; }
+.green { background: #aaffaa; }
+.pink { background: #ffaaff; }
+.yellow { background: #ffffaa; }
+</style>
+
+<p>Test passes if each pair of blue / orange boxes are identical (except for the color of their border).
+
+
+<div class="w6"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<br>ب<span class=yellow> </span></div>
+<div class="w6 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<br>ب<span class=yellow> </span></div>
+
+<hr>
+
+<div class="w7"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span><br>ب<span class=yellow> </span></div>
+<div class="w7 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span><br>ب<span class=yellow> </span></div>
+
+<hr>
+
+<div class="w8"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
+<div class="w8 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب</div>
+
+<hr>
+
+<div class="w9"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
+<div class="w9 ref"><span class=pink> </span>A<span class=blue> </span>B<span class=red> </span>ا<span class=green> </span>ب<span class=yellow> </span></div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html
new file mode 100644
index 00000000000..1b6fddd30e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/trailing-ogham-001-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test Reference</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<style>
+div {
+    border: solid;
+    width: min-content;
+}
+.soft-wrap { border-color: blue; }
+.hard-break { border-color: orange; }
+
+</style>
+
+<p>Test passes if the content of the blue and orange boxes is identical to that of the black box.
+
+<div class=soft-wrap>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
+<div class=hard-break>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
+<div class=ref>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-001.html
new file mode 100644
index 00000000000..f687c7cdc37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-001.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: trailing ogham spaces</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/trailing-ogham-001-ref.html">
+<meta name="assert" content="tailing collaspible ogham spaces are removed">
+<style>
+div {
+    border: solid;
+    width: min-content;
+}
+.soft-wrap { border-color: blue; }
+.hard-break { border-color: orange; }
+
+</style>
+
+<p>Test passes if the content of the blue and orange boxes is identical to that of the black box.
+
+<div class=soft-wrap>᚛ᚑᚌ�ᚋ᚜&#x1680;᚛ᚑᚌ�ᚋ᚜</div>
+<div class=hard-break>᚛ᚑᚌ�ᚋ᚜&#x1680;<br>᚛ᚑᚌ�ᚋ᚜</div>
+<div class=ref>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-002.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-002.html
new file mode 100644
index 00000000000..7bf17750783
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-002.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: trailing pre-line ogham spaces</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/trailing-ogham-001-ref.html">
+<meta name="assert" content="tailing collaspible (with pre-line) ogham spaces are removed">
+<style>
+div {
+    border: solid;
+    width: min-content;
+    white-space: pre-line;
+}
+.soft-wrap { border-color: blue; }
+.hard-break { border-color: orange; }
+
+</style>
+
+<p>Test passes if the content of the blue and orange boxes is identical to that of the black box.
+
+<div class=soft-wrap>᚛ᚑᚌ�ᚋ᚜&#x1680;᚛ᚑᚌ�ᚋ᚜</div>
+<div class=hard-break>᚛ᚑᚌ�ᚋ᚜&#x1680;<br>᚛ᚑᚌ�ᚋ᚜</div>
+<div class=ref>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-003.html b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-003.html
new file mode 100644
index 00000000000..597feba3096
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/trailing-ogham-003.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Text level 3 Test: trailing nowrap ogham spaces</title>
+<link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
+<link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
+<link rel="match" href="reference/trailing-ogham-001-ref.html">
+<meta name="assert" content="tailing collaspible (nowrap) ogham spaces are removed">
+<style>
+div {
+    border: solid;
+    width: min-content;
+    white-space: nowrap;
+}
+.br { border-color: blue; }
+.end-of-element { border-color: orange; }
+
+</style>
+
+<p>Test passes if the content of the blue and orange boxes is identical to that of the black box.
+
+<div class=end-of-element>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜&#x1680;</div>
+<div class=br>᚛ᚑᚌ�ᚋ᚜&#x1680;<br>᚛ᚑᚌ�ᚋ᚜</div>
+<div class=ref>᚛ᚑᚌ�ᚋ᚜<br>᚛ᚑᚌ�ᚋ᚜</div>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-004.html b/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-004.html
new file mode 100644
index 00000000000..71038ac11f7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/changing-while-transition-004.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<html>
+<head>
+<meta charset=utf-8>
+<title>CSS Transitions Test: behavior when transition changes to default while transitioning</title>
+<meta name="assert" content="Checks a change to the transition-duration
+property does not affect an in-flight transition">
+<link rel="help" title="3. Starting of transitions" href="https://drafts.csswg.org/css-transitions/#starting">
+
+<script src="/resources/testharness.js" type="text/javascript"></script>
+<script src="/resources/testharnessreport.js" type="text/javascript"></script>
+<script src="./support/helper.js" type="text/javascript"></script>
+
+</head>
+<body>
+<div id="log"></div>
+
+<script>
+promise_test(async t => {
+  // Start a 100s transition 50% of the way through
+  const div = addDiv(t, {
+    style: 'transition: height 100s -50s linear; height: 0px',
+  });
+  getComputedStyle(div).height;
+  div.style.height = '100px';
+  assert_equals(
+    getComputedStyle(div).height,
+    '50px',
+    'Transition should be initially 50% complete'
+  );
+
+  // Unset the transition property (with default all 0s).
+  div.style.transition = '';
+
+  // If the change to the transition-duration was reflected, the
+  // transition would be cancelled and the computed height
+  // would now be '25px'.
+  assert_equals(
+    getComputedStyle(div).height,
+    '50px',
+    'Even after unsetting transition, the transition should be 50% complete'
+  );
+
+  // Wait a frame just to be sure that the changed duration is not later
+  // updated.
+  await waitForFrame();
+
+  assert_greater_than_equal(
+    parseInt(getComputedStyle(div).height),
+    50,
+    'Even in the next frame the updated transition should not apply'
+  );
+}, 'Unsettign transition should not affect in-flight transitions');
+</script>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-001.html b/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-001.html
index 921525ea72d..8fa5f5825aa 100644
--- a/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transitions/transition-delay-001.html
@@ -69,11 +69,7 @@
                         });
                         var result = computedStyle(transition, 'transition-delay');
                         assert_equals(result, values[key], "Expected computed value");
-                    }, "parse '" + key + "'",
-                    {
-                        // mark tests that fail as such
-                        flags: invalidTests[key] ? "invalid" : ""
-                    });
+                    }, "parse '" + key + "'");
                 }
             }
         </script>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-001.html b/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-001.html
index b5c095f001e..60b9f5fc5c8 100644
--- a/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-001.html
+++ b/tests/wpt/web-platform-tests/css/css-transitions/transition-duration-001.html
@@ -70,11 +70,7 @@
                         });
                         var result = computedStyle(transition, 'transition-duration');
                         assert_equals(result, values[key], "Expected computed value");
-                    }, "parse '" + key + "'",
-                    {
-                        // mark tests that fail as such
-                        flags: invalidTests[key] ? "invalid" : ""
-                    });
+                    }, "parse '" + key + "'");
                 }
             }
         </script>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001-ref.html b/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001-ref.html
deleted file mode 100644
index 3e4da522e54..00000000000
--- a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001-ref.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Reference: appearance: button</title>
-<style>
- #container { width: 500px; }
- #container > :not(a) { appearance: auto; }
-</style>
-<div id="container">
-	<input type="text" value="input-text">
-	<input type="search" value="input-search">
-	<textarea>textarea</textarea>
-	<input type="button" value="input-button">
-	<input type="submit" value="input-submit">
-	<input type="reset" value="input-reset">
-	<input type="range">
-	<input type="checkbox">
-	<input type="radio">
-	<input type="color">
-	<select multiple><option>select-multiple</option></select>
-	<meter value=0.5></meter>
-	<progress value=0.5></progress>
-</div>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001.html b/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001.html
index 33fccb58065..317f56b18ae 100644
--- a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001.html
+++ b/tests/wpt/web-platform-tests/css/css-ui/appearance-button-001.html
@@ -2,13 +2,15 @@
 <meta charset="utf-8">
 <title>CSS Basic User Interface Test: appearance: button</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
-<meta name="assert" content="button is treated as auto on input, textarea, list box select, meter, and progress elements.">
-<link rel="match" href="appearance-button-001-ref.html">
+<meta name="assert" content="button is an alias to auto.">
+<link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
  #container > * { appearance: none; appearance: button; }
 </style>
 <div id="container">
+	<a>a</a>
+	<button>button</button>
 	<input type="text" value="input-text">
 	<input type="search" value="input-search">
 	<textarea>textarea</textarea>
@@ -19,6 +21,7 @@
 	<input type="checkbox">
 	<input type="radio">
 	<input type="color">
+	<select><option>select</option></select>
 	<select multiple><option>select-multiple</option></select>
 	<meter value=0.5></meter>
 	<progress value=0.5></progress>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative-ref.html b/tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative-ref.html
deleted file mode 100644
index c8c10ea511f..00000000000
--- a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative-ref.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Reference: appearance: button</title>
-<select><option>select</option></select>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative.html b/tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative.html
deleted file mode 100644
index 5c9e9a280ac..00000000000
--- a/tests/wpt/web-platform-tests/css/css-ui/appearance-button-002.tentative.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Basic User Interface Test: appearance: button</title>
-<link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
-<meta name="assert" content="Drop-down select elements with appearance: button are rendered differently from appearance: auto.">
-<link rel="mismatch" href="appearance-button-002.tentative-ref.html">
-<style>
- select { appearance: none; appearance: button; }
-</style>
-<!--
-  Test marked as tentative since although css-ui says "The element is rendered
-  with the look and feel of a push button, similar to the appearance: auto
-  rendering of the [HTML] button element.", there is no requirement that the
-  look and feel of a push button is different from that of a drop-down select.
-  -->
-<select><option>select</option></select>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html
new file mode 100644
index 00000000000..5f5ddde393f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-auto-input-non-widget-001.html
@@ -0,0 +1,16 @@
+<!-- DO NOT EDIT THIS FILE.
+Edit the appearance-* file instead and then run:
+    ./tools/appearance-build-webkit-reftests.py
+-->
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Basic User Interface Test: -webkit-appearance: auto on non-widget input elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
+<meta name="assert" content="The default widget type for these elements is none.">
+<link rel="match" href="appearance-auto-input-non-widget-001-ref.html">
+<style>
+input { -webkit-appearance: auto; }
+</style>
+<input type="hidden" value="abc">
+<input type="image" value="def">
+<input type="file">
diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-001.html b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-001.html
index c71a914723b..cf36b42384a 100644
--- a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-001.html
+++ b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-001.html
@@ -6,13 +6,15 @@ Edit the appearance-* file instead and then run:
 <meta charset="utf-8">
 <title>CSS Basic User Interface Test: -webkit-appearance: button</title>
 <link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
-<meta name="assert" content="button is treated as auto on input, textarea, list box select, meter, and progress elements.">
-<link rel="match" href="appearance-button-001-ref.html">
+<meta name="assert" content="button is an alias to auto.">
+<link rel="match" href="appearance-auto-ref.html">
 <style>
  #container { width: 500px; }
  #container > * { -webkit-appearance: none; -webkit-appearance: button; }
 </style>
 <div id="container">
+	<a>a</a>
+	<button>button</button>
 	<input type="text" value="input-text">
 	<input type="search" value="input-search">
 	<textarea>textarea</textarea>
@@ -23,6 +25,7 @@ Edit the appearance-* file instead and then run:
 	<input type="checkbox">
 	<input type="radio">
 	<input type="color">
+	<select><option>select</option></select>
 	<select multiple><option>select-multiple</option></select>
 	<meter value=0.5></meter>
 	<progress value=0.5></progress>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-002.tentative.html b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-002.tentative.html
deleted file mode 100644
index 4c322fa20e4..00000000000
--- a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-button-002.tentative.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Basic User Interface Test: -webkit-appearance: button</title>
-<link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
-<meta name="assert" content="Drop-down select elements with appearance: button are rendered differently from appearance: auto.">
-<link rel="mismatch" href="appearance-button-002.tentative-ref.html">
-<style>
- select { -webkit-appearance: none; -webkit-appearance: button; }
-</style>
-<!--
-  Test marked as tentative since although css-ui says "The element is rendered
-  with the look and feel of a push button, similar to the appearance: auto
-  rendering of the [HTML] button element.", there is no requirement that the
-  look and feel of a push button is different from that of a drop-down select.
-  -->
-<select><option>select</option></select>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-002.html b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-002.html
new file mode 100644
index 00000000000..5394836b756
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/webkit-appearance-progress-bar-002.html
@@ -0,0 +1,20 @@
+<!-- DO NOT EDIT THIS FILE.
+Edit the appearance-* file instead and then run:
+    ./tools/appearance-build-webkit-reftests.py
+-->
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Basic User Interface Test: progress dynamic appearance</title>
+<link rel="help" href="https://drafts.csswg.org/css-ui-4/#appearance-switching">
+<link rel="match" href="appearance-progress-bar-002-ref.html">
+<style>
+  #progress1 { -webkit-appearance: none }
+  #progress2 { -webkit-appearance: auto }
+</style>
+<progress id="progress1" value="0.5">
+<progress id="progress2" value="0.5">
+<script>
+  document.body.offsetTop;
+  progress1.style.appearance = "auto";
+  progress2.style.appearance = "none";
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print-ref.html b/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print-ref.html
new file mode 100644
index 00000000000..bc914522c7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print-ref.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS test reference</title>
+<style>
+  body { margin: 0 }
+  :root {
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    border: 1px solid black;
+  }
+</style>
+<div>I should not overflow to the next page.</div>
diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print.html b/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print.html
new file mode 100644
index 00000000000..3bff494e535
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-values/viewport-units-001-print.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Viewport units in print account for margins</title>
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1414600">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/5437">
+<link rel="help" href="https://drafts.csswg.org/css-values-4/#viewport-relative-lengths">
+<link rel="match" href="viewport-units-001-print-ref.html">
+<style>
+  body { margin: 0 }
+  div {
+    box-sizing: border-box;
+    width: 100vw;
+    height: 100vh;
+    border: 1px solid black;
+  }
+</style>
+<div>I should not overflow to the next page.</div>
diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003-ref.html b/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003-ref.html
new file mode 100644
index 00000000000..38138ebcac3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003-ref.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test Reference</title>
+<style>
+  div {
+    background: green;
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003.html b/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003.html
new file mode 100644
index 00000000000..b764d2e86d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-will-change/will-change-stacking-context-003.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: will-change: opacity should create a stacking context for inlines.</title>
+<link rel="author" title="Philip Rogers" href="mailto:pdr@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1119651">
+<link rel="help" href="https://drafts.csswg.org/css-will-change/#will-change">
+<link rel="match" href="will-change-stacking-context-003-ref.html">
+<style>
+  .indicator {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background: green;
+    z-index: 1;
+  }
+  .will-change-opacity {
+    will-change: opacity;
+    width: 100px;
+    height: 100px;
+  }
+  .top {
+    position: absolute;
+    width: 100px;
+    height: 100px;
+    background: red;
+    z-index: 3;
+  }
+</style>
+
+<div class="indicator"></div>
+<span class="will-change-opacity">
+  <!-- Because will-change: opacity creates a stacking context, this child
+       remains on bottom even though it has a higher z-index than the indicator
+       box. -->
+  <div class="top"></div>
+</span>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/client-props-root-display-none-crash.html b/tests/wpt/web-platform-tests/css/cssom-view/client-props-root-display-none-crash.html
new file mode 100644
index 00000000000..654e321e420
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/client-props-root-display-none-crash.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#extension-to-the-element-interface">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1655741">
+<link rel="author" title="Emilio Cobos �lvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<title>Shouldn't assert when asking for the client* props on the scrolling element</title>
+<style>
+  :root { display: none }
+</style>
+<script>
+  document.scrollingElement.clientTop;
+  document.scrollingElement.clientLeft;
+  document.scrollingElement.clientHeight;
+  document.scrollingElement.clientWidth;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html b/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html
index 8aef8697747..7b4a8e38632 100644
--- a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html
+++ b/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <title>Testing scrollOptions' behavior for Element.scroll* and scroll-behavior on the root of the main frame</title>
 <meta name="timeout" content="long"/>
+<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
 <link rel="author" title="Frédéric Wang" href="mailto:fwang@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/cssom-view/#propdef-scroll-behavior">
 <link rel="help" href="https://drafts.csswg.org/cssom-view/#scrolling-box">
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html b/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html
index 0a8ed39d1b9..ef587fea49c 100644
--- a/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html
+++ b/tests/wpt/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <title>Testing scrollOptions' behavior for Element.scroll* and scroll-behavior on the root of a subframe</title>
 <meta name="timeout" content="long"/>
+<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
 <link rel="author" title="Frédéric Wang" href="mailto:fwang@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/cssom-view/#propdef-scroll-behavior">
 <link rel="help" href="https://drafts.csswg.org/cssom-view/#scrolling-box">
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSCounterStyleRule.html b/tests/wpt/web-platform-tests/css/cssom/CSSCounterStyleRule.html
new file mode 100644
index 00000000000..afae84b0b25
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSCounterStyleRule.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSOM - CSSCounterStyleRule interface</title>
+<link rel="help" href="https://drafts.csswg.org/css-counter-styles-3/#csscounterstylerule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @counter-style foo {
+    system: cyclic;
+    symbols: ‣;
+    suffix: " ";
+  }
+</style>
+<script>
+test(function() {
+  // TODO: The exact serialization isn't well specified (the ordering of the
+  // descriptors isn't defined).
+  let rule = document.styleSheets[0].cssRules[0];
+  assert_false(rule.cssText.includes('\n'));
+}, "CSSCounterStyleRule.cssText doesn't serialize with newlines");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSFontFaceRule.html b/tests/wpt/web-platform-tests/css/cssom/CSSFontFaceRule.html
new file mode 100644
index 00000000000..438c30df9eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSFontFaceRule.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSSOM -  CSSFontFaceRule interface</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#cssfontfacerule">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @font-face {
+    src: local("foo");
+    font-family: foo;
+    font-weight: bold;
+  }
+</style>
+<script>
+test(function() {
+  // TODO: The exact serialization isn't consistent across browsers
+  // (Firefox doesn't preserve ordering of the descriptors, WebKit/Blink does).
+  let rule = document.styleSheets[0].cssRules[0];
+  assert_false(rule.cssText.includes('\n'));
+}, "CSSFontFaceRule.cssText doesn't serialize with newlines");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/removerule-invalidation-crash.html b/tests/wpt/web-platform-tests/css/cssom/removerule-invalidation-crash.html
new file mode 100644
index 00000000000..a83f43d5faf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/removerule-invalidation-crash.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>CSSOM - removeRule doesn't assert when removing a particular set of rules</title>
+<link rel="help" href="https://drafts.csswg.org/cssom/#cssstylesheet">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1659718">
+<style>
+@media all {
+  * { color: red; }
+
+  #foobar { color: blue }
+}
+</style>
+<script>
+  document.documentElement.getBoundingClientRect();
+  document.styleSheets[0].deleteRule(0);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-foreignObject.html b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-foreignObject.html
new file mode 100644
index 00000000000..4ccaa0cf81f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/filter-effects/backdrop-filter-svg-foreignObject.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>backdrop-filter: on SVG foreignObject</title>
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-2/#BackdropFilterProperty">
+<link rel="match"  href="backdrop-filter-basic-ref.html">
+
+<div>
+  <p>Expected: A green box and an overlapping black box, with a magenta<br>
+  overlapping region.</p>
+</div>
+<div class="colorbox">
+  <svg>
+    <foreignObject class="filterbox"></foreignObject>
+  </svg>
+</div>
+
+<style>
+.colorbox {
+    position: absolute;
+    background: green;
+    width: 100px;
+    height: 100px;
+    left: 10px;
+    top: 100px;
+}
+svg {
+    position: absolute;
+    width: 200px;
+    height: 200px;
+    left: 50px;
+    top: 50px;
+}
+.filterbox {
+    width: 100px;
+    height: 100px;
+    backdrop-filter: invert(1);
+}
+</style>
+
diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html b/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
index 617e0b97256..fe0d2f057c3 100644
--- a/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
+++ b/tests/wpt/web-platform-tests/css/mediaqueries/prefers-contrast.html
@@ -7,8 +7,8 @@
 <script>
 query_should_be_css_parseable("(prefers-contrast)");
 query_should_be_css_parseable("(prefers-contrast: no-preference)");
-query_should_be_css_parseable("(prefers-contrast: high)");
-query_should_be_css_parseable("(prefers-contrast: low)");
+query_should_be_css_parseable("(prefers-contrast: more)");
+query_should_be_css_parseable("(prefers-contrast: less)");
 query_should_be_css_parseable("(prefers-contrast: forced)");
 
 query_should_not_be_css_parseable("(prefers-contrast: increase)");
@@ -18,11 +18,13 @@ query_should_not_be_css_parseable("(prefers-contrast: forced low)");
 query_should_not_be_css_parseable("(prefers-contrast > increase)");
 query_should_not_be_css_parseable("(prefers-increased-contrast)");
 query_should_not_be_css_parseable("(prefers-decreased-contrast)");
+query_should_not_be_css_parseable("(prefers-contrast: high)");
+query_should_not_be_css_parseable("(prefers-contrast: low)");
 
 query_should_be_js_parseable("(prefers-contrast)");
 query_should_be_js_parseable("(prefers-contrast: no-preference)");
-query_should_be_js_parseable("(prefers-contrast: high)");
-query_should_be_js_parseable("(prefers-contrast: low)");
+query_should_be_js_parseable("(prefers-contrast: more)");
+query_should_be_js_parseable("(prefers-contrast: less)");
 query_should_be_js_parseable("(prefers-contrast: forced)");
 
 query_should_not_be_js_parseable("(prefers-contrast: increase)");
@@ -32,6 +34,8 @@ query_should_not_be_js_parseable("(prefers-contrast: forced low)");
 query_should_not_be_js_parseable("(prefers-contrast > increase)");
 query_should_not_be_js_parseable("(prefers-increased-contrast)");
 query_should_not_be_js_parseable("(prefers-decreased-contrast)");
+query_should_not_be_js_parseable("(prefers-contrast: high)");
+query_should_not_be_js_parseable("(prefers-contrast: low)");
 
 test(() => {
   // no-preference is the default and all other values evaluate to
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html
index 2dcb3e34b21..95a27006e62 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-007.html
@@ -57,7 +57,7 @@
       document.body.dataset.hadmousedown = "";
     }, true);
 
-    async_test(async function(t) {
+    async_test(function(t) {
       let tested_modality_change = false;
       let tested_modality_unchanged_by_mouse_click = false;
       let tested_mouse_focus_after_modality_change = false;
diff --git a/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html b/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html
index f95458fc4d3..0c05c21800d 100644
--- a/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html
+++ b/tests/wpt/web-platform-tests/css/selectors/focus-visible-011.html
@@ -41,7 +41,7 @@
       next.focus();
     });
 
-    async_test(async function(t) {
+    async_test(function(t) {
       next.addEventListener("focus", t.step_func(() => {
         assert_equals(getComputedStyle(next).outlineColor, "rgb(0, 100, 0)");
         t.done()
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/background/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/background/reftest.list
index cdaad122cbe..21cdb382112 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/background/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/background/reftest.list
@@ -1,4 +1,5 @@
 # background-repeat round/space test cases
+# background-repeat space is broken under SWGL (see bug 1658815)
 == background-repeat-space-1a.html background-repeat-space-1-ref.html
 == background-repeat-space-1b.html background-repeat-space-1-ref.html
 == background-repeat-space-1c.html background-repeat-space-1-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
index 97621fe19fe..fc45fc352c0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/reftest.list
@@ -58,9 +58,6 @@ include ruby/reftest.list
 # Selectors Level 4
 include selectors4/reftest.list
 
-# Shapes Level 1
-include shapes1/reftest.list
-
 # CSS Intrinsic & Extrinsic Sizing Module Level 3
 include sizing/reftest.list
 
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
deleted file mode 100644
index ab097ac7f95..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
+++ /dev/null
@@ -1,111 +0,0 @@
-# <shape-box> only
-== shape-outside-margin-box-001.html shape-outside-margin-box-001-ref.html
-== shape-outside-margin-box-002.html shape-outside-margin-box-002-ref.html
-== shape-outside-border-box-001.html shape-outside-border-box-001-ref.html
-== shape-outside-border-box-002.html shape-outside-border-box-002-ref.html
-== shape-outside-padding-box-001.html shape-outside-padding-box-001-ref.html
-== shape-outside-padding-box-002.html shape-outside-padding-box-002-ref.html
-== shape-outside-content-box-001.html shape-outside-content-box-001-ref.html
-== shape-outside-content-box-002.html shape-outside-content-box-002-ref.html
-
-# <shape-box> with border-radius
-== shape-outside-margin-box-border-radius-001.html shape-outside-margin-box-border-radius-001-ref.html
-== shape-outside-margin-box-border-radius-002.html shape-outside-margin-box-border-radius-002-ref.html
-== shape-outside-margin-box-border-radius-003.html shape-outside-margin-box-border-radius-003-ref.html
-== shape-outside-margin-box-border-radius-004.html shape-outside-margin-box-border-radius-004-ref.html
-== shape-outside-margin-box-border-radius-005.html shape-outside-margin-box-border-radius-005-ref.html
-== shape-outside-margin-box-border-radius-006.html shape-outside-margin-box-border-radius-006-ref.html
-== shape-outside-margin-box-border-radius-007.html shape-outside-margin-box-border-radius-007-ref.html
-== shape-outside-margin-box-border-radius-008.html shape-outside-margin-box-border-radius-008-ref.html
-== shape-outside-border-box-border-radius-001.html shape-outside-border-box-border-radius-001-ref.html
-== shape-outside-border-box-border-radius-002.html shape-outside-border-box-border-radius-002-ref.html
-== shape-outside-border-box-border-radius-003.html shape-outside-border-box-border-radius-003-ref.html
-== shape-outside-border-box-border-radius-004.html shape-outside-border-box-border-radius-004-ref.html
-== shape-outside-border-box-border-radius-005.html shape-outside-border-box-border-radius-005-ref.html
-== shape-outside-border-box-border-radius-006.html shape-outside-border-box-border-radius-006-ref.html
-== shape-outside-border-box-border-radius-007.html shape-outside-border-box-border-radius-007-ref.html
-== shape-outside-border-box-border-radius-008.html shape-outside-border-box-border-radius-008-ref.html
-== shape-outside-border-box-border-radius-009.html shape-outside-border-box-border-radius-009-ref.html
-== shape-outside-border-box-border-radius-010.html shape-outside-border-box-border-radius-010-ref.html
-== shape-outside-border-box-border-radius-011.html shape-outside-border-box-border-radius-011-ref.html
-== shape-outside-border-box-border-radius-012.html shape-outside-border-box-border-radius-012-ref.html
-== shape-outside-padding-box-border-radius-001.html shape-outside-padding-box-border-radius-001-ref.html
-== shape-outside-padding-box-border-radius-002.html shape-outside-padding-box-border-radius-002-ref.html
-== shape-outside-content-box-border-radius-001.html shape-outside-content-box-border-radius-001-ref.html
-== shape-outside-content-box-border-radius-002.html shape-outside-content-box-border-radius-002-ref.html
-
-# Basic shape: circle()
-== shape-outside-circle-032.html shape-outside-circle-032-ref.html
-== shape-outside-circle-033.html shape-outside-circle-033-ref.html
-== shape-outside-circle-034.html shape-outside-circle-034-ref.html
-== shape-outside-circle-035.html shape-outside-circle-035-ref.html
-== shape-outside-circle-036.html shape-outside-circle-036-ref.html
-== shape-outside-circle-037.html shape-outside-circle-036-ref.html
-== shape-outside-circle-038.html shape-outside-circle-036-ref.html
-== shape-outside-circle-041.html shape-outside-circle-041-ref.html
-== shape-outside-circle-042.html shape-outside-circle-042-ref.html
-== shape-outside-circle-043.html shape-outside-circle-042-ref.html
-== shape-outside-circle-044.html shape-outside-circle-042-ref.html
-== shape-outside-circle-047.html shape-outside-circle-047-ref.html
-== shape-outside-circle-048.html shape-outside-circle-048-ref.html
-== shape-outside-circle-049.html shape-outside-circle-049-ref.html
-== shape-outside-circle-050.html shape-outside-circle-050-ref.html
-== shape-outside-circle-051.html shape-outside-circle-051-ref.html
-== shape-outside-circle-052.html shape-outside-circle-052-ref.html
-== shape-outside-circle-053.html shape-outside-circle-053-ref.html
-== shape-outside-circle-054.html shape-outside-circle-054-ref.html
-== shape-outside-circle-055.html shape-outside-circle-055-ref.html
-== shape-outside-circle-056.html shape-outside-circle-056-ref.html
-
-# Basic shape: ellipse()
-== shape-outside-ellipse-032.html shape-outside-ellipse-032-ref.html
-== shape-outside-ellipse-033.html shape-outside-ellipse-033-ref.html
-== shape-outside-ellipse-034.html shape-outside-ellipse-034-ref.html
-== shape-outside-ellipse-035.html shape-outside-ellipse-035-ref.html
-== shape-outside-ellipse-036.html shape-outside-ellipse-036-ref.html
-== shape-outside-ellipse-037.html shape-outside-ellipse-037-ref.html
-== shape-outside-ellipse-038.html shape-outside-ellipse-038-ref.html
-== shape-outside-ellipse-039.html shape-outside-ellipse-039-ref.html
-== shape-outside-ellipse-040.html shape-outside-ellipse-040-ref.html
-== shape-outside-ellipse-041.html shape-outside-ellipse-040-ref.html
-== shape-outside-ellipse-042.html shape-outside-ellipse-042-ref.html
-== shape-outside-ellipse-043.html shape-outside-ellipse-042-ref.html
-== shape-outside-ellipse-044.html shape-outside-ellipse-044-ref.html
-== shape-outside-ellipse-045.html shape-outside-ellipse-045-ref.html
-== shape-outside-ellipse-046.html shape-outside-ellipse-046-ref.html
-== shape-outside-ellipse-047.html shape-outside-ellipse-047-ref.html
-== shape-outside-ellipse-048.html shape-outside-ellipse-048-ref.html
-== shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
-== shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
-== shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
-== shape-outside-ellipse-052.html shape-outside-ellipse-052-ref.html
-
-# Basic shape: inset()
-== shape-outside-inset-016.html shape-outside-inset-016-ref.html
-== shape-outside-inset-017.html shape-outside-inset-017-ref.html
-== shape-outside-inset-020.html shape-outside-inset-020-ref.html
-== shape-outside-inset-021.html shape-outside-inset-021-ref.html
-== shape-outside-inset-022.html shape-outside-inset-022-ref.html
-== shape-outside-inset-023.html shape-outside-inset-023-ref.html
-== shape-outside-inset-024.html shape-outside-inset-024-ref.html
-== shape-outside-inset-025.html shape-outside-inset-025-ref.html
-== shape-outside-inset-026.html shape-outside-inset-026-ref.html
-== shape-outside-inset-027.html shape-outside-inset-027-ref.html
-
-# Basic shape: polygon()
-== shape-outside-polygon-018.html shape-outside-polygon-018-ref.html
-== shape-outside-polygon-019.html shape-outside-polygon-019-ref.html
-== shape-outside-polygon-020.html shape-outside-polygon-020-ref.html
-== shape-outside-polygon-021.html shape-outside-polygon-021-ref.html
-== shape-outside-polygon-022.html shape-outside-polygon-022-ref.html
-== shape-outside-polygon-023.html shape-outside-polygon-023-ref.html
-== shape-outside-polygon-024.html shape-outside-polygon-024-ref.html
-== shape-outside-polygon-025.html shape-outside-polygon-025-ref.html
-== shape-outside-polygon-032.html shape-outside-polygon-032-ref.html
-
-# Tests of shape-outside layout behavior with too-wide inline elements
-== float-retry-push-circle.html float-retry-push-ref.html
-== float-retry-push-image.html float-retry-push-ref.html
-== float-retry-push-inset.html float-retry-push-ref.html
-== float-retry-push-polygon.html float-retry-push-ref.html
-== float-should-push.html float-should-push-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/support/Ahem.ttf b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/support/Ahem.ttf
deleted file mode 100644
index ac81cb03165ab831a36abb59145ff7a2f5675fb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12480
zcmeHNZFm&b6@KSqXFq`?V#J8_W{Z(327;C%rN~F5ND+}BqNU0vJIMyKyK#48f&xWr
z)kgU!T8&C6B7%Y<3R(n85fK4VsitTVmo!>UZB&Y2eGpjRJ3A2++dqB$VLP+W?3{b<
zy=Tt7=bd}c?z~U{_%Rb2`d(7jr(eU^QL_ML0JW1VqM_O@yYfc>t{T8dRE3hYI0asy
z?@HF^RMkwayl7QwHx0A^1>uMp3h!DpraSA_^Xwm?!tK-ZDIeh3GZIZTJR>lj_L~5$
zxh7r_5_M+=fud6C+M}U{T6`+)E8W;$#6nSXM%O#m0KNM1{*l^vGBs=G>5V`!`>Wj`
zeOE9n@03fcuI@7EAiP=|HCPqD`U-j7c+T>RfXo1`O%p6?P^Fd!`)MLGfZtYoeoITo
z9|tYXL3r#wU#;iuwKiogTol%;^ayjZSLJ#1Q#5L!a~$%R2|S(yG14mV>+*Al14AJ8
zskRRSTLqNdA*|Dc<*Bed<2+?OlwLZgGY1X^zTFs*k8}3aN82k-cWSt{s6{YTpM2g~
z`084ta52dq9ap<}!X?{NgU)ryfSaqAT!VaE-vj7`&gg<1<RT9zp({>CKG*VYI28pr
z4c&1%df+<{C`1t7MNgc8BAkg{_#V!}+31aPP>eq4ixTw1xi}BsM}PbP18_bD;)fW7
zA7L;q;JP*x!!R7BxDX@oV~oT_7=@o;G%m&%T!OK<6ys2a@wf~Va5*O83S5bwViJCa
zt8g_Y)87!vQGqZ_RH6zIRAUORK@FmaA&y#Hiv*HLp$^xf9u1g^>v037abKB%pL4l=
z6F1@}`~o-QE&LL<;8xs*xA7}9;(gqXJJ5z%_y^iC8*}gu-o@Y0jK5<pevQ{K4|n1&
z{04X9J^TqD;8om%CZrjq`*1(z<7K>pKVui(z+doNEWq#ZAr@jMTJZo{@K-A$d$0(v
zV>kBVK`h2YSc0W^7>{5Xmg7-8#x^VPI9B2bJc(6Uji>N5evdVH25Yg7JEu-GfU`A(
zQS8hp%s@sdQOcACWuE$ix=npcyGwgSTd!>tIijm55Isat6p6lKpeQX278V87pb_j6
z%nKF-dj!u8jtou?n!){NY~QD5GPElg(}lD*&a$_K_TD(o-btdH=q`k1@BA;>%MG6T
zg}tz451CBn?My3o*c&s`G7~cw07u$+4nA_$;n$9I-J5CI1hlMgS=X|r<?)uKEerNO
zyZ5nlYkEg|mz<~c_VkAIL+Qr!t#5tyX3w0DY}}8Mb@Gs4mgjND(c|Rf#db#F#N%GZ
zQR3hMM*0s#LnCo8m+`zCn~901h>}@&0b7ZTImF2#&i@u-pb6Wt4KES}_c3-4GU^hK
zw-b>|iOI!`=5jll8;H;qRz&9$sm~KxPgrrS!bWT&?y8C1Da7qHMD9Fdx0dLY*i8|=
z61#sSdZ!Y<*Au%p5J`73($g&jKa1yxs#U~778&b^lC>7zUMF5R)7SSLlw<?$pyWTI
zL?)ulBeiQZ!8ObcoSR#idq!by;dJ%GBXg7kM+2HT+%laj4kyyil(|Q-QK8m$xEm{F
zChpY9Ul7i`IGAvr2WKsC)&ggLaQ4P;I4@w<!Tq+R@MLSx+3MsV*?%$rXLAsS`^0s%
z#mPOLoZQK~o!?^4?@;GA_}A<Y-*67%{N{K52Xg)cb8;{z2Xk^TCkJzKFeeB5H#r!{
zC&+$+WC#rA+x{#0?(;gnbDhWcm@D{(YCGSUzl#Hks^lm=l-|lfWu!7e2`dR@rZQWZ
zuPjs6C|i_frB&Id9908qf!a&$ua>Ig)X8d0ou)RbP3jVLwYo{&sixI-^^oS#^0l5?
zKW&IMMw_Hf(HgW{_#S(awo==m?a+49(@%6=&(nootPj#h=@a#^p3rCNv-SD<GJTD{
zMQ_$y^?mwLSHM-^>gDS1Ds_!>O?Jgx(_D?NCf5?zYS$*$PFLF1?mA?6jC`Y~(a#uS
zj4>t|Q;Y`V7UM2sk+IU)VC*n<8*RoXZrz>d7VcvAAonQuM0ce-<-W;1*S)~~sC%t@
zt9zIG9ru0@Je@t=J!g3a@H4_Q-c#<W^~~_x;knQAu;*#dX3wjh7SD&C!(N}ao43e&
zo_CmctoJH!jrV%*ZQi@Ri@i^JH+o<8?(x3w{nTgpy842?zP`b}(Y`Bv5#M#bn|<?q
z3w<km>wVjOZ}{Hz9q_CE9DfggZ~s95NdE+X*q`vv^w0Ls_b>CW@o(`r`&<3{{6_<U
zKtZ5apnsq=FfK4T5DQETGzOXiO9HC{n*uun=|FqnP$y5P{7yYP^<y@0nsV$N{Q{P=
zhXRk%QBu)aSz_xo2xYY`>ul3(%P!<Adu-XDe!qOWtm75skS!~G%e~E(Rk+ocY*|B&
z+HA`@+q`4TF8I|BE}udD$F@F)^1p03mv%n0<vi$`%DqjITs>uhX4o>vqA#{(jzxde
zmN^!Etu1pb`fgk1SoBs~=2-MkZ8--Xm;4`7+RsI2m&ca#sLv-OCT{Uq1i1wfvJ4VD
zE65HoEq;rzG$sT!5$XibD8G~B5Y*Xqy)A76dzoYxq*y8<?`9~=b(S4zBSzMOAg8C6
zr)*zOYt_~rrL72ksHZkWSz3v)UmuHmbF3`LZb-15ynBZ)<yH@q?1pOgG06=QWb`B{
zRr207ELE~c!s=mCpR(Fjv0PzUl3a)+by6Rv1?kIFtDPKW(y}+!x@(yBq-Syz<!mF!
z9g4Fg%OmJTgsr3p@?OX8nVqrWWEz!GU&eM(+L1F{O;%Hqx^l~UJ>_g)Iq%2(Eaogq
z8&R^AOtO&Vm}G<|Sgob!S+7gzX$h@$wC=cmeLK7MV)9r;MI@96Riw;BQiKwwNJUIx
zMn&@4I+l71v!TMQO^KolhgQ_3Oc9EOMX)y5ThvFYD<UEpiPwuzvcim|`h-pEDk>B4
zsAZ)*lr(FqV`j0qENNEO)riV?LZr-OsybFBD&kSHXsc7z@t8<XO{UCfvRI5w#KUzJ
zW>}O@731UKuow}FBw}VF+mntBFDnyep=ezqRDEVrlqcf#N!Hpni-$(c=s2^gt|pY2
zz~M;KCB-E|s^xi{u0v(FmPO|&_<wy0zIbN7{DgHpL27n0$lSop;shcXH3z9w$!_^F
z+wt4Pbo_65jyGByN6B!!jU2W{a@1y#=_YxMcar0FkHr^TNcP(zi-#!rhmw6LxrbR+
z*;=yVp0gNm+nArdh#h#z;y3Oj^YJxuA|=o9b&Kh^o1Dr$WK*WeX_PF-Hu5Fkw>Xp^
zka_nJ_Tit{kB`anKZsAPxJh>7I&$S6Ca>*&i|4r6VmdxgM&2f}@0OEmw}A|}^<>R8
zk!g1?xpwo&ubgACFPD;w_bOR*&yq>6D!M-AveBc}k>j<}3rEwsX0h^fppeg~eGU!H
Bc@h8s

diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
index 32826ee1654..4167c674870 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <link rel="author" title="Boris Chiou" href="mailto:boris.chiou@gmail.com">
   <link rel="help" href="https://drafts.csswg.org/css-sizing/#sizing-values">
-  <link rel="match" href="hori-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html">
+  <link rel="match" href="vert-block-size-small-or-larger-than-container-with-min-or-max-content-2-ref.html">
   <meta name="flags" content="ahem">
   <link rel="stylesheet" type="text/css" href="support/ahem.css">
   <link rel="stylesheet" type="text/css" href="support/min-content-max-content.css">
diff --git a/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry.html b/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry.html
index cc81e3a2cd3..15d983f1c49 100644
--- a/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry.html
+++ b/tests/wpt/web-platform-tests/custom-elements/CustomElementRegistry.html
@@ -655,7 +655,8 @@ promise_test(function () {
 }, 'customElements.whenDefined must return a rejected promise when the given name is not a valid custom element name');
 
 promise_test(function () {
-    customElements.define('preexisting-custom-element', class extends HTMLElement { });
+    class PreexistingCustomElement extends HTMLElement { };
+    customElements.define('preexisting-custom-element', PreexistingCustomElement);
 
     var promise = customElements.whenDefined('preexisting-custom-element');
     promise.then(function (value) { promise.resolved = value; }, function (value) { promise.rejected = value; });
@@ -665,8 +666,8 @@ promise_test(function () {
 
     return Promise.resolve().then(function () {
         assert_true('resolved' in promise, 'The promise returned by "whenDefined" must be resolved when a custom element is defined');
-        assert_equals(promise.resolved, undefined,
-            'The promise returned by "whenDefined" must be resolved with "undefined" when a custom element is defined');
+        assert_equals(promise.resolved, PreexistingCustomElement,
+            'The promise returned by "whenDefined" must be resolved with the constructor of the element when a custom element is defined');
         assert_false('rejected' in promise, 'The promise returned by "whenDefined" must not be rejected when a custom element is defined');
     });
 }, 'customElements.whenDefined must return a resolved promise when the registry contains the entry with the given name');
@@ -688,16 +689,17 @@ promise_test(function () {
 
     return Promise.resolve().then(function () {
         assert_true('resolved' in promise1, 'The promise returned by "whenDefined" must be resolved when a custom element is defined');
-        assert_equals(promise1.resolved, undefined, 'The promise returned by "whenDefined" must be resolved with "undefined" when a custom element is defined');
+        assert_equals(promise1.resolved, AnotherExistingCustomElement, 'The promise returned by "whenDefined" must be resolved with the constructor of the element when a custom element is defined');
         assert_false('rejected' in promise1, 'The promise returned by "whenDefined" must not be rejected when a custom element is defined');
 
         assert_true('resolved' in promise2, 'The promise returned by "whenDefined" must be resolved when a custom element is defined');
-        assert_equals(promise2.resolved, undefined, 'The promise returned by "whenDefined" must be resolved with "undefined" when a custom element is defined');
+        assert_equals(promise2.resolved, AnotherExistingCustomElement, 'The promise returned by "whenDefined" must be resolved with the constructor of the element when a custom element is defined');
         assert_false('rejected' in promise2, 'The promise returned by "whenDefined" must not be rejected when a custom element is defined');
     });
 }, 'customElements.whenDefined must return a new resolved promise each time invoked when the registry contains the entry with the given name');
 
 promise_test(function () {
+    class ElementDefinedAfterWhenDefined extends HTMLElement { };
     var promise = customElements.whenDefined('element-defined-after-whendefined');
     promise.then(function (value) { promise.resolved = value; }, function (value) { promise.rejected = value; });
 
@@ -710,7 +712,7 @@ promise_test(function () {
         assert_false('rejected' in promise, 'The promise returned by "whenDefined" must not be rejected until the element is defined');
         assert_equals(customElements.whenDefined('element-defined-after-whendefined'), promise,
             '"whenDefined" must return the same unresolved promise before the custom element is defined');
-        customElements.define('element-defined-after-whendefined', class extends HTMLElement { });
+        customElements.define('element-defined-after-whendefined', ElementDefinedAfterWhenDefined);
         assert_false('resolved' in promise, 'The promise returned by "whenDefined" must not be resolved until the end of the next microtask');
         assert_false('rejected' in promise, 'The promise returned by "whenDefined" must not be rejected until the end of the next microtask');
 
@@ -721,17 +723,33 @@ promise_test(function () {
         assert_false('rejected' in promiseAfterDefine, 'The promise returned by "whenDefined" must not be rejected until the end of the next microtask');
     }).then(function () {
         assert_true('resolved' in promise, 'The promise returned by "whenDefined" must be resolved when a custom element is defined');
-        assert_equals(promise.resolved, undefined,
-            'The promise returned by "whenDefined" must be resolved with "undefined" when a custom element is defined');
+        assert_equals(promise.resolved, ElementDefinedAfterWhenDefined,
+            'The promise returned by "whenDefined" must be resolved with the constructor of the element when a custom element is defined');
         assert_false('rejected' in promise, 'The promise returned by "whenDefined" must not be rejected when a custom element is defined');
 
         assert_true('resolved' in promiseAfterDefine, 'The promise returned by "whenDefined" must be resolved when a custom element is defined');
-        assert_equals(promiseAfterDefine.resolved, undefined,
-            'The promise returned by "whenDefined" must be resolved with "undefined" when a custom element is defined');
+        assert_equals(promiseAfterDefine.resolved, ElementDefinedAfterWhenDefined,
+            'The promise returned by "whenDefined" must be resolved with the constructor of the element when a custom element is defined');
         assert_false('rejected' in promiseAfterDefine, 'The promise returned by "whenDefined" must not be rejected when a custom element is defined');
     });
 }, 'A promise returned by customElements.whenDefined must be resolved by "define"');
 
+promise_test(function () {
+    class ResolvedCustomElement extends HTMLElement {};
+    customElements.define('resolved-custom-element', ResolvedCustomElement);
+    return customElements.whenDefined('resolved-custom-element').then(function (value) {
+        assert_true(value === ResolvedCustomElement, 'The promise returned by "whenDefined" must resolve with the defined class');
+    });
+}, 'A promise returned by customElements.whenDefined must be resolved with the defined class');
+
+promise_test(function () {
+    var promise = customElements.whenDefined('not-resolved-yet-custom-element').then(function (value) {
+        assert_true(value === NotResolvedYetCustomElement, 'The promise returned by "whenDefined" must resolve with the defined class once such class is defined');
+    });
+    class NotResolvedYetCustomElement extends HTMLElement {};
+    customElements.define('not-resolved-yet-custom-element', NotResolvedYetCustomElement);
+    return promise;
+}, 'A promise returned by customElements.whenDefined must be resolved with the defined class once such class is defined');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/docs/Makefile b/tests/wpt/web-platform-tests/docs/Makefile
index 1b7fe8e8f59..9bd9c429f55 100644
--- a/tests/wpt/web-platform-tests/docs/Makefile
+++ b/tests/wpt/web-platform-tests/docs/Makefile
@@ -16,9 +16,9 @@ help:
 tools/%:
 	mkdir -p $(shell dirname $@)
 	test -d ../$@
-	ln -s ../../$@ $@
+	ln -s ${CURDIR}/../$@ $@
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile tools/wptserve tools/certs tools/wptrunner
+%: Makefile tools/wptserve tools/certs tools/wptrunner tools/third_party/pywebsocket3
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/tests/wpt/web-platform-tests/docs/admin/index.md b/tests/wpt/web-platform-tests/docs/admin/index.md
index 98725bfa31b..3073b9678fe 100644
--- a/tests/wpt/web-platform-tests/docs/admin/index.md
+++ b/tests/wpt/web-platform-tests/docs/admin/index.md
@@ -10,13 +10,23 @@ infrastructure which makes the project possible.
    :titlesonly:
 
    ../README
-   ../tools/wptserve/docs/index.rst
    ../tools/wptrunner/README
+   ../tools/wptserve/docs/index.rst
+   pywebsocket3
 
 .. toctree::
    :hidden:
 
    ../tools/wptserve/README
+   ../tools/third_party/pywebsocket3/README
+```
+
+### Indices and tables
+
+```eval_rst
+* :ref:`modindex`
+* :ref:`genindex`
+* :ref:`search`
 ```
 
 ## Secrets
diff --git a/tests/wpt/web-platform-tests/docs/admin/pywebsocket3.rst b/tests/wpt/web-platform-tests/docs/admin/pywebsocket3.rst
new file mode 100644
index 00000000000..af768d6b354
--- /dev/null
+++ b/tests/wpt/web-platform-tests/docs/admin/pywebsocket3.rst
@@ -0,0 +1,91 @@
+pywebsocket3: A Standalone WebSocket Server for testing purposes
+================================================================
+
+.. contents::
+   :local:
+
+:mod:`mod_pywebsocket`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket
+   :members:
+
+:mod:`mod_pywebsocket.common`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.common
+   :members:
+
+:mod:`mod_pywebsocket.dispatch`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.dispatch
+   :members:
+
+:mod:`mod_pywebsocket.extensions`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.extensions
+   :members:
+
+:mod:`mod_pywebsocket.handshake`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.handshake
+   :members:
+   :imported-members:
+
+:mod:`mod_pywebsocket.request_handler`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.request_handler
+   :members:
+
+:mod:`mod_pywebsocket.stream`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.stream
+   :members:
+   :imported-members:
+
+:mod:`mod_pywebsocket.http_header_util`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.http_header_util
+   :members:
+
+:mod:`mod_pywebsocket.msgutil`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.msgutil
+   :members:
+
+:mod:`mod_pywebsocket.util`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.util
+   :members:
+
+:mod:`mod_pywebsocket.memorizingfile`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.memorizingfile
+   :members:
+
+:mod:`mod_pywebsocket.websocket_server`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.websocket_server
+   :members:
+
+:mod:`mod_pywebsocket.server_util`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.server_util
+   :members:
+
+:mod:`mod_pywebsocket.standalone`
+---------------------------------------------
+
+.. automodule:: mod_pywebsocket.standalone
+   :members:
diff --git a/tests/wpt/web-platform-tests/docs/conf.py b/tests/wpt/web-platform-tests/docs/conf.py
index 89f30a02a33..44d3c2f76bb 100644
--- a/tests/wpt/web-platform-tests/docs/conf.py
+++ b/tests/wpt/web-platform-tests/docs/conf.py
@@ -16,6 +16,7 @@ import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.insert(0, os.path.abspath('../tools/wptserve'))
+sys.path.insert(0, os.path.abspath('../tools/third_party/pywebsocket3'))
 sys.path.insert(0, os.path.abspath('../tools'))
 import localpaths
 
@@ -44,7 +45,9 @@ extensions = [
     'recommonmark',
     'sphinxarg.ext',
     'sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx'
+    'sphinx.ext.intersphinx',
+    # Google-style Python docs
+    'sphinx.ext.napoleon',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -59,10 +62,23 @@ source_suffix = '.rst'
 # The master toctree document.
 master_doc = 'index'
 
-# These values are used in the documentation of wptserve but are not recognized
-# by Sphinx.
+# These values are used in third-party documentation not recognized by Sphinx.
 # https://stackoverflow.com/questions/51824453/how-to-document-parameter-of-type-function-in-sphinx
-nitpick_ignore = [('py:class', 'Callable'), ('py:obj', 'None')]
+nitpick_ignore = [
+    # wptserve
+    ('py:class', 'Callable'),
+    ('py:obj', 'None'),
+    # pywebsocket3
+    ('py:exc', 'AbortedByUserException'),
+    ('py:exc', 'HandshakeException'),
+    ('py:exc', 'InvalidFrameException'),
+    ('py:exc', 'UnsupportedFrameException'),
+    ('py:exc', 'InvalidUTF8Exception'),
+    ('py:exc', 'ConnectionTerminatedException'),
+    ('py:exc', 'BadOperationException'),
+    ('py:exc', 'Exception'),
+    ('py:exc', 'ValueError'),
+]
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/tests/wpt/web-platform-tests/docs/make.bat b/tests/wpt/web-platform-tests/docs/make.bat
index 49607bb0ae9..415076a912f 100755
--- a/tests/wpt/web-platform-tests/docs/make.bat
+++ b/tests/wpt/web-platform-tests/docs/make.bat
@@ -31,6 +31,9 @@ if not exist tools\wptserve\ ( mklink /d tools\wptserve ..\..\tools\wptserve )
 if not exist tools\certs\ ( mklink /d tools\certs ..\..\tools\certs )
 if not exist tools\wptrunner\ ( mklink /d tools\wptrunner ..\..\tools\wptrunner )
 
+if not exist tools\third_party\ ( mkdir tools\third_party )
+if not exist tools\third_party\pywebsocket3\ ( mklink /d tools\third_party\pywebsocket3 ..\..\..\tools\third_party\pywebsocket3 )
+
 %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
 goto end
 
diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md b/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md
index 91823444d5d..f5cfa36915d 100644
--- a/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md
+++ b/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md
@@ -7,7 +7,8 @@ The tests are designed to be run from your local computer.
 Running the tests requires `python`, `pip` and `virtualenv`, as well as updating
 the system `hosts` file.
 
-Note that Python 2.7 is required. Using Python 3 is not supported.
+Python 3 is supported and preferred, but for now it is still possible to use
+Python 2.7 if necessary.
 
 The required setup is different depending on your operating system.
 
@@ -22,6 +23,10 @@ On Debian or Ubuntu:
 sudo apt-get install python python-pip virtualenv
 ```
 
+It is important to have a package that provides a `python` binary. On Fedora,
+for example, that means installing the `python-unversioned-command` package. On
+Ubuntu Focal and later, the package is called `python-is-python3`.
+
 ### macOS Setup
 
 The system-provided Python can be used, while `pip` and `virtualenv` can be
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/idlharness.md b/tests/wpt/web-platform-tests/docs/writing-tests/idlharness.md
index 13e1dc03fef..4af4224e644 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/idlharness.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/idlharness.md
@@ -1,113 +1,86 @@
-# idlharness.js API
+# IDL Tests (idlharness.js)
 
 ## Introduction ##
 
-`idlharness.js` automatically generates browser tests for WebIDL interfaces, using
-the testharness.js framework.  To use, first include the following:
+`idlharness.js` generates tests for Web IDL fragments, using the
+[JavaScript Tests (`testharness.js`)](testharness.md) infrastructure. You typically want to use
+`.any.js` or `.window.js` for this to avoid having to write unnessary boilerplate.
 
-```html
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-```
+## Adding IDL fragments
 
-Then you'll need some type of IDLs.  Here's some script that can be run on a
-spec written in HTML, which will grab all the elements with `class="idl"`,
-concatenate them, and replace the body so you can copy-paste:
+Web IDL is automatically scraped from specifications and added to the `/interfaces/` directory. See
+the [README](https://github.com/web-platform-tests/wpt/blob/master/interfaces/README.md) there for
+details.
 
+## Testing IDL fragments
+
+For example, the Fetch API's IDL is tested in
+[`/fetch/api/idlharness.any.js`](https://github.com/web-platform-tests/wpt/blob/master/fetch/api/idlharness.any.js):
 ```js
-var s = "";
-[].forEach.call(document.getElementsByClassName("idl"), function(idl) {
-  //https://www.w3.org/Bugs/Public/show_bug.cgi?id=14914
-  if (!idl.classList.contains("extract"))
-  {
-    if (s !== "")
-    {
-      s += "\n\n";
+// META: global=window,worker
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: timeout=long
+
+idl_test(
+  ['fetch'],
+  ['referrer-policy', 'html', 'dom'],
+  idl_array => {
+    idl_array.add_objects({
+      Headers: ["new Headers()"],
+      Request: ["new Request('about:blank')"],
+      Response: ["new Response()"],
+    });
+    if (self.GLOBAL.isWindow()) {
+      idl_array.add_objects({ Window: ['window'] });
+    } else if (self.GLOBAL.isWorker()) {
+      idl_array.add_objects({ WorkerGlobalScope: ['self'] });
     }
-    s += idl.textContent.replace(/ +$/mg, "");
   }
-});
-document.body.innerHTML = '<pre></pre>';
-document.body.firstChild.textContent = s;
+);
 ```
+Note how it includes `/resources/WebIDLParser.js` and `/resources/idlharness.js` in addition to
+`testharness.js` and `testharnessreport.js` (automatically included due to usage of `.any.js`).
+These are needed to make the `idl_test` function work.
 
-Once you have that, put it in your script somehow.  The easiest way is to
-embed it literally in an HTML file with `<script type=text/plain>` or similar,
-so that you don't have to do any escaping.  Another possibility is to put it
-in a separate .idl file that's fetched via XHR or similar.  Sample usage:
+The `idl_test` function takes three arguments:
 
-```js
-var idl_array = new IdlArray();
-idl_array.add_untested_idls("interface Node { readonly attribute DOMString nodeName; };");
-idl_array.add_idls("interface Document : Node { readonly attribute DOMString URL; };");
-idl_array.add_objects({Document: ["document"]});
-idl_array.test();
-```
+* _srcs_: a list of specifications whose IDL you want to test. The names here need to match the filenames (excluding the extension) in `/interfaces/`.
+* _deps_: a list of specifications the IDL listed in _srcs_ depends upon. Be careful to list them in the order that the dependencies are revealed.
+* _setup_func_: a function or async function that takes care of creating the various objects that you want to test.
 
-This tests that `window.Document` exists and meets all the requirements of
-WebIDL.  It also tests that window.document (the result of evaluating the
-string "document") has URL and nodeName properties that behave as they
-should, and otherwise meets WebIDL's requirements for an object whose
-primary interface is Document.  It does not test that window.Node exists,
-which is what you want if the Node interface is already tested in some other
-specification's suite and your specification only extends or refers to it.
-Of course, each IDL string can define many different things, and calls to
-add_objects() can register many different objects for different interfaces:
-this is a very simple example.
+## Methods of `IdlArray` ##
 
-## Public methods of IdlArray ##
-
-IdlArray objects can be obtained with `new IdlArray()`.  Anything not
-documented in this section should be considered an implementation detail,
-and outside callers should not use it.
-
-### `add_idls(idl_string)`
-  Parses `idl_string` (throwing on parse error) and adds the results to the
-  IdlArray.  All the definitions will be tested when you run test().  If
-  some of the definitions refer to other definitions, those must be present
-  too.  For instance, if `idl_string` says that `Document` inherits from `Node`,
-  the `Node` interface must also have been provided in some call to `add_idls()`
-  or `add_untested_idls()`.
-
-### `add_untested_idls(idl_string)`
-  Like `add_idls()`, but the definitions will not be tested.  If an untested
-  interface is added and then extended with a tested partial interface, the
-  members of the partial interface will still be tested.  Also, all the
-  members will still be tested for objects added with `add_objects()`, because
-  you probably want to test that (for instance) window.document has all the
-  properties from `Node`, not just `Document`, even if the `Node` interface itself
-  is tested in a different test suite.
+`IdlArray` objects can be obtained through the _setup_func_ argument of `idl_test`. Anything not
+documented in this section should be considered an implementation detail, and outside callers should
+not use it.
 
 ### `add_objects(dict)`
-  `dict` should be an object whose keys are the names of interfaces or
-  exceptions, and whose values are arrays of strings.  When an interface or
-  exception is tested, every string registered for it with `add_objects()`
-  will be evaluated, and tests will be run on the result to verify that it
-  correctly implements that interface or exception.  This is the only way to
-  test anything about `[NoInterfaceObject]` interfaces, and there are many
-  tests that can't be run on any interface without an object to fiddle with.
 
-  The interface has to be the *primary* interface of all the objects
-  provided.  For example, don't pass `{Node: ["document"]}`, but rather
-  `{Document: ["document"]}`.  Assuming the `Document` interface was declared to
-  inherit from `Node`, this will automatically test that document implements
-  the `Node` interface too.
+_dict_ should be an object whose keys are the names of interfaces or exceptions, and whose values
+are arrays of strings.  When an interface or exception is tested, every string registered for it
+with `add_objects()` will be evaluated, and tests will be run on the result to verify that it
+correctly implements that interface or exception.  This is the only way to test anything about
+`[NoInterfaceObject]` interfaces, and there are many tests that can't be run on any interface
+without an object to fiddle with.
 
-  Warning: methods will be called on any provided objects, in a manner that
-  WebIDL requires be safe.  For instance, if a method has mandatory
-  arguments, the test suite will try calling it with too few arguments to
-  see if it throws an exception.  If an implementation incorrectly runs the
-  function instead of throwing, this might have side effects, possibly even
-  preventing the test suite from running correctly.
+The interface has to be the *primary* interface of all the objects provided.  For example, don't
+pass `{Node: ["document"]}`, but rather `{Document: ["document"]}`.  Assuming the `Document`
+interface was declared to inherit from `Node`, this will automatically test that document implements
+the `Node` interface too.
+
+Warning: methods will be called on any provided objects, in a manner that WebIDL requires be safe.
+For instance, if a method has mandatory arguments, the test suite will try calling it with too few
+arguments to see if it throws an exception. If an implementation incorrectly runs the function
+instead of throwing, this might have side effects, possibly even preventing the test suite from
+running correctly.
 
 ### `prevent_multiple_testing(name)`
-  This is a niche method for use in case you're testing many objects that
-  implement the same interfaces, and don't want to retest the same
-  interfaces every single time.  For instance, HTML defines many interfaces
-  that all inherit from `HTMLElement`, so the HTML test suite has something
-  like
+
+This is a niche method for use in case you're testing many objects that implement the same
+interfaces, and don't want to retest the same interfaces every single time. For instance, HTML
+defines many interfaces that all inherit from `HTMLElement`, so the HTML test suite has something
+like
 
 ```js
 .add_objects({
@@ -118,17 +91,11 @@ and outside callers should not use it.
 })
 ```
 
-  and so on for dozens of element types.  This would mean that it would
-  retest that each and every one of those elements implements `HTMLElement`,
-  `Element`, and `Node`, which would be thousands of basically redundant tests.
-  The test suite therefore calls `prevent_multiple_testing("HTMLElement")`.
-  This means that once one object has been tested to implement `HTMLElement`
-  and its ancestors, no other object will be.  Thus in the example code
-  above, the harness would test that `document.documentElement` correctly
-  implements `HTMLHtmlElement`, `HTMLElement`, `Element`, and `Node`; but
-  `document.head` would only be tested for `HTMLHeadElement`, and so on for
-  further objects.
-
-### `test()`
-  Run all tests.  This should be called after you've called all other
-  methods to add IDLs and objects.
+and so on for dozens of element types.  This would mean that it would retest that each and every one
+of those elements implements `HTMLElement`, `Element`, and `Node`, which would be thousands of
+basically redundant tests. The test suite therefore calls `prevent_multiple_testing("HTMLElement")`.
+This means that once one object has been tested to implement `HTMLElement` and its ancestors, no
+other object will be.  Thus in the example code above, the harness would test that
+`document.documentElement` correctly implements `HTMLHtmlElement`, `HTMLElement`, `Element`, and
+`Node`; but `document.head` would only be tested for `HTMLHeadElement`, and so on for further
+objects.
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md b/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md
index 4f4011a6c21..07723c289db 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/server-pipes.md
@@ -91,6 +91,14 @@ whereas:
 Will cause example.html to be returned with both text/html and
 text/plain content-type headers.
 
+If the comma (`,`) or closing parenthesis (`)`) characters appear in the header
+value, those characters  must be escaped with a backslash (`\`):
+
+    example?pipe=header(Expires,Thu\,%2014%20Aug%201986%2018:00:00%20GMT)
+
+(Note that the programming environment from which the request is issued may
+require that the backslash character itself be escaped.)
+
 ### `slice`
 
 Used to send only part of a response body. Takes the start and,
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
index 38997a2dcc9..fb0af83c9a9 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
@@ -185,7 +185,34 @@ assertions don't need to be wrapped in `step` or `step_func`
 calls. However when mixing event handlers and `promise_test`, the
 event handler callback functions *do* need to be wrapped since an
 exception in these functions does not cause the promise chain to
-reject.
+reject. The best way to simplify tests and avoid confusion is to **limit the
+code in Promise "executor" functions to only track asynchronous operations**;
+place fallible assertion code in subsequent reaction handlers.
+
+For example, instead of
+
+```js
+promise_test(t => {
+  return new Promise(resolve => {
+    window.addEventListener("DOMContentLoaded", t.step_func(event => {
+      assert_true(event.bubbles, "bubbles should be true");
+      resolve();
+    }));
+  });
+}, "DOMContentLoaded");
+```
+
+Try,
+
+```js
+promise_test(() => {
+  return new Promise(resolve => {
+    window.addEventListener("DOMContentLoaded", resolve);
+  }).then(event => {
+    assert_true(event.bubbles, "bubbles should be true");
+  });
+}, "DOMContentLoaded");
+```
 
 Unlike Asynchronous Tests, Promise Tests don't start running until after the
 previous Promise Test finishes. [Under rare
@@ -407,14 +434,14 @@ These functions are preferred over `step_timeout` as they end when a condition o
 `step_wait(cond, description, timeout=3000, interval=100)` is useful inside `promise_test`, e.g.:
 
 ```js
-promise_test(t => {
+promise_test(async t => {
   // …
   await t.step_wait(() => frame.contentDocument === null, "Frame navigated to a cross-origin document");
   // …
 }, "");
 ```
 
-`step_wait_func(cond, func, description, timeout=3000, interval=100)` & `step_wait_func(cond, func, description, timeout=3000, interval=100)` are useful inside `async_test`:
+`step_wait_func(cond, func, description, timeout=3000, interval=100)` and `step_wait_func_done(cond, func, description, timeout=3000, interval=100)` are useful inside `async_test`:
 
 ```js
 async_test(t => {
@@ -839,6 +866,8 @@ asserts that `expected` is an Array, and `actual` is equal to one of the
 members i.e. `expected.indexOf(actual) != -1`
 
 ### `assert_object_equals(actual, expected, description)`
+**DEPRECATED**: see [issue #2033](https://github.com/web-platform-tests/wpt/issues/2033).
+
 asserts that `actual` is an object and not null and that all enumerable
 properties on `actual` are own properties on `expected` with the same values,
 recursing if the value is an object and not null.
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md b/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md
index 1037eaca03c..7cf7f73a868 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testharness.md
@@ -1,114 +1,94 @@
 # JavaScript Tests (testharness.js)
 
-```eval_rst
-.. toctree::
-   :maxdepth: 1
-
-   idlharness
-   testharness-api
-   testdriver-extension-tutorial
-   testdriver
-```
-
-testharness.js tests are the correct type of test to write in any
+JavaScript tests are the correct type of test to write in any
 situation where you are not specifically interested in the rendering
 of a page, and where human interaction isn't required; these tests are
-written in JavaScript using a framework called `testharness.js`. It is
-documented in two sections:
+written in JavaScript using a framework called `testharness.js`.
+
+A high-level overview is provided below and more information can be found here:
 
   * [testharness.js Documentation](testharness-api.md) — An introduction
-    to the library and a detailed API reference.
+    to the library and a detailed API reference. [The tutorial on writing a
+    testharness.js test](testharness-tutorial) provides a concise guide to writing
+    a test — a good place to start for newcomers to the project.
+
+  * [testdriver.js Automation](testdriver.md) — Automating end user actions, such as moving or
+    clicking a mouse. See also the
+    [testdriver.js extension tutorial](testdriver-extension-tutorial.md) for adding new commands.
 
   * [idlharness.js Documentation](idlharness.md) — A library for testing
      IDL interfaces using `testharness.js`.
 
 See [server features](server-features.md) for advanced testing features that are commonly used
-with testharness.js. See also the [general guidelines](general-guidelines.md) for all test types.
+with JavaScript tests. See also the [general guidelines](general-guidelines.md) for all test types.
 
-This page describes testharness.js exhaustively; [the tutorial on writing a
-testharness.js test](testharness-tutorial) provides a concise guide to writing
-a test--a good place to start for newcomers to the project.
+## Window tests
 
-## Variants
+### Without HTML boilerplate (`.window.js`)
 
-A test file can have multiple variants by including `meta` elements,
-for example:
+Create a JavaScript file whose filename ends in `.window.js` to have the necessary HTML boilerplate
+generated for you at `.window.html`. I.e., for `test.window.js` the server will ensure
+`test.window.html` is available.
 
-```html
-<meta name="variant" content="">
-<meta name="variant" content="?wss">
+In this JavaScript file you can place one or more tests, as follows:
+```js
+test(() => {
+  // Place assertions and logic here
+  assert_equals(document.characterSet, "UTF-8");
+}, "Ensure HTML boilerplate uses UTF-8"); // This is the title of the test
 ```
 
-The test can then do different things based on the URL.
+If you only need to test a [single thing](testharness-api.md#single-page-tests), you could also use:
+```js
+// META: title=Ensure HTML boilerplate uses UTF-8
+setup({ single_test: true });
+assert_equals(document.characterSet, "UTF-8");
+done();
+```
 
-There are two utility scripts in that work well together with variants,
-`/common/subset-tests.js` and `/common/subset-tests-by-key.js`, where
-a test that would otherwise have too many tests to be useful can be
-split up in ranges of subtests. For example:
+See [asynchronous (`async_test()`)](testharness-api.md#asynchronous-tests) and
+[promise tests (`promise_test()`)](testharness-api.md#promise-tests) for more involved setups.
+
+### With HTML boilerplate
+
+You need to be a bit more explicit and include the `testharness.js` framework directly as well as an
+additional file used by implementations:
 
 ```html
 <!doctype html>
-<title>Testing variants</title>
-<meta name="variant" content="?1-1000">
-<meta name="variant" content="?1001-2000">
-<meta name="variant" content="?2001-last">
-<script src="/resources/testharness.js">
-<script src="/resources/testharnessreport.js">
-<script src="/common/subset-tests.js">
-<script>
- const tests = [
-                 { fn: t => { ... }, name: "..." },
-                 ... lots of tests ...
-               ];
- for (const test of tests) {
-   subsetTest(async_test, test.fn, test.name);
- }
-</script>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <script>
+    test(() => {
+      assert_equals(document.characterSet, "UTF-8");
+    }, "Ensure UTF-8 declaration is observed");
+  </script>
 ```
 
-With `subsetTestByKey`, the key is given as the first argument, and the
-query string can include or exclude a key (will be matched as a regular
-expression).
+Here too you could avoid the wrapper `test()` function:
 
 ```html
 <!doctype html>
-<title>Testing variants by key</title>
-<meta name="variant" content="?include=Foo">
-<meta name="variant" content="?include=Bar">
-<meta name="variant" content="?exclude=(Foo|Bar)">
-<script src="/resources/testharness.js">
-<script src="/resources/testharnessreport.js">
-<script src="/common/subset-tests-by-key.js">
-<script>
-   subsetTestByKey("Foo", async_test, () => { ... }, "Testing foo");
-   ...
-</script>
+<meta charset=utf-8>
+<title>Ensure UTF-8 declaration is observed</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <script>
+    setup({ single_test: true });
+    assert_equals(document.characterSet, "UTF-8");
+    done();
+  </script>
 ```
 
-## Auto-generated test boilerplate
+In this case the test title is taken from the `title` element.
 
-While most JavaScript tests require a certain amount of HTML
-boilerplate to include the test library, etc., tests which are
-expressible purely in script (e.g. tests for workers) can have all the
-needed HTML and script boilerplate auto-generated.
+## Dedicated worker tests (`.worker.js`)
 
-### Standalone window tests
-
-Tests that only require a script file running in window scope can use
-standalone window tests. In this case the test is a javascript file
-with the extension `.window.js`. This is sourced from a generated
-document which sources `testharness.js`, `testharnessreport.js` and
-the test script. For a source script with the name
-`example.window.js`, the corresponding test resource will be
-`example.window.html`.
-
-### Standalone workers tests
-
-Tests that only require assertions in a dedicated worker scope can use
-standalone workers tests. In this case, the test is a JavaScript file
-with extension `.worker.js` that imports `testharness.js`. The test can
-then use all the usual APIs, and can be run from the path to the
-JavaScript file with the `.js` removed.
+Create a JavaScript file that imports `testharness.js` and whose filename ends in `.worker.js` to
+have the necessary HTML boilerplate generated for you at `.worker.html`.
 
 For example, one could write a test for the `FileReaderSync` API by
 creating a `FileAPI/FileReaderSync.worker.js` as follows:
@@ -125,7 +105,10 @@ done();
 
 This test could then be run from `FileAPI/FileReaderSync.worker.html`.
 
-### Multi-global tests
+(Removing the need for `importScripts()` and `done()` is tracked in
+[issue #11529](https://github.com/web-platform-tests/wpt/issues/11529).)
+
+## Tests for other or multiple globals (`.any.js`)
 
 Tests for features that exist in multiple global scopes can be written in a way
 that they are automatically run in several scopes. In this case, the test is a
@@ -178,16 +161,18 @@ be made available by the framework:
     self.GLOBAL.isWindow()
     self.GLOBAL.isWorker()
 
-Although [the global `done` function must be explicitly invoked for most
+Although [the global `done()` function must be explicitly invoked for most
 dedicated worker tests and shared worker
 tests](testharness-api.html#determining-when-all-tests-are-complete), it is
 automatically invoked for tests defined using the "multi-global" pattern.
 
-### Specifying a test title in auto-generated boilerplate tests
+## Other features of `.window.js`, `.worker.js` and `.any.js`
+
+### Specifying a test title
 
 Use `// META: title=This is the title of the test` at the beginning of the resource.
 
-### Including other JavaScript resources in auto-generated boilerplate tests
+### Including other JavaScript files
 
 Use `// META: script=link/to/resource.js` at the beginning of the resource. For example,
 
@@ -198,11 +183,11 @@ Use `// META: script=link/to/resource.js` at the beginning of the resource. For
 
 can be used to include both the global and a local `utils.js` in a test.
 
-### Specifying a timeout of long in auto-generated boilerplate tests
+### Specifying a timeout of long
 
 Use `// META: timeout=long` at the beginning of the resource.
 
-### Specifying test [variants](#variants) in auto-generated boilerplate tests
+### Specifying test [variants](#variants)
 
 Use `// META: variant=url-suffix` at the beginning of the resource. For example,
 
@@ -210,3 +195,71 @@ Use `// META: variant=url-suffix` at the beginning of the resource. For example,
 // META: variant=
 // META: variant=?wss
 ```
+
+## Variants
+
+A test file can have multiple variants by including `meta` elements,
+for example:
+
+```html
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
+```
+
+Test runners will execute the test for each variant specified, appending the corresponding content
+attribute value to the URL of the test as they do so.
+
+`/common/subset-tests.js` and `/common/subset-tests-by-key.js` are two utility scripts that work
+well together with variants, allowing a test to be split up into subtests in cases when there are
+otherwise too many tests to complete inside the timeout. For example:
+
+```html
+<!doctype html>
+<title>Testing variants</title>
+<meta name="variant" content="?1-1000">
+<meta name="variant" content="?1001-2000">
+<meta name="variant" content="?2001-last">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/subset-tests.js">
+<script>
+ const tests = [
+                 { fn: t => { ... }, name: "..." },
+                 ... lots of tests ...
+               ];
+ for (const test of tests) {
+   subsetTest(async_test, test.fn, test.name);
+ }
+</script>
+```
+
+With `subsetTestByKey`, the key is given as the first argument, and the
+query string can include or exclude a key (which will be matched as a regular
+expression).
+
+```html
+<!doctype html>
+<title>Testing variants by key</title>
+<meta name="variant" content="?include=Foo">
+<meta name="variant" content="?include=Bar">
+<meta name="variant" content="?exclude=(Foo|Bar)">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/subset-tests-by-key.js"></script>
+<script>
+   subsetTestByKey("Foo", async_test, () => { ... }, "Testing foo");
+   ...
+</script>
+```
+
+## Table of Contents
+
+```eval_rst
+.. toctree::
+   :maxdepth: 1
+
+   testharness-api
+   testdriver
+   testdriver-extension-tutorial
+   idlharness
+```
diff --git a/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html b/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html
index d572dcb0465..5a01f4e1ece 100644
--- a/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html
+++ b/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html
@@ -13,7 +13,7 @@
 
 // This document is served with a Document Policy header that should satisfy
 // any requests that include a required policy for the
-// 'unoptimized-lossless-images' feature.
+// 'lossless-images-max-bpp' feature.
 const params = new URLSearchParams(window.location.search);
 const id = params.get('id');
 const level = params.get('level');
diff --git a/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html.headers b/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html.headers
index a6c7386bda0..419a3c3dd16 100644
--- a/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html.headers
+++ b/tests/wpt/web-platform-tests/document-policy/echo-policy-nested.html.headers
@@ -1 +1 @@
-Document-Policy: unoptimized-lossless-images=0.0
+Document-Policy: lossless-images-max-bpp=0.0
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/document-write.tentative.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-write.tentative.html
similarity index 89%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/document-write.tentative.html
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/document-write.tentative.html
index 7e09ef7e77a..551703c6f56 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/document-write.tentative.html
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/document-write.tentative.html
@@ -2,7 +2,7 @@
 <title>'document-write' tests</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="/feature-policy/experimental-features/resources/common.js"></script>
+<script src="/document-policy/experimental-features/resources/common.js"></script>
 <style>
 html, body {
   height: 100%;
@@ -20,7 +20,8 @@ html, body {
   }
 
   let iframeElement = document.querySelector("iframe");
-  let url = url_base + "document-write.html";
+  const allowed_url = url_base + "document-write-allowed.html";
+  const disallowed_url = url_base + "document-write-disallowed.html";
 
   let text_to_write = "<div>FOO<\/div>";
   let test_cases = [{
@@ -49,7 +50,7 @@ html, body {
   test_cases.forEach((tc) => {
     promise_test(async() => {
       let iframeElement = newIframe();
-      await loadUrlInIframe(iframeElement, url);
+      await loadUrlInIframe(iframeElement, allowed_url);
       await sendMessageAndGetResponse(iframeElement.contentWindow, tc).then((response) => {
         assert_false(
           response.did_throw_exception,
@@ -70,8 +71,7 @@ html, body {
   test_cases.forEach((tc) => {
     promise_test(async() => {
       let iframeElement = newIframe();
-      setFeatureState(iframeElement, "document-write", "'none'");
-      await loadUrlInIframe(iframeElement, url);
+      await loadUrlInIframe(iframeElement, disallowed_url);
       await sendMessageAndGetResponse(iframeElement.contentWindow, tc).then((response) => {
         assert_true(
           response.did_throw_exception,
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/async-script.js b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/async-script.js
similarity index 100%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/async-script.js
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/resources/async-script.js
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/defer-script.js b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/defer-script.js
similarity index 100%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/defer-script.js
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/resources/defer-script.js
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/document-write.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-allowed.html
similarity index 100%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/document-write.html
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-allowed.html
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html
new file mode 100644
index 00000000000..633fa85e6ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<style>
+#spacer {
+  width: 200%;
+  height: 200%;
+}
+</style>
+<body>
+<script>
+  window.addEventListener("message", onMessageReceived);
+
+  function test(api, args) {
+    let did_throw = false;
+    try {
+     document[api](args);
+    } catch(e) {
+      did_throw = true;
+    }
+    return did_throw;
+  }
+
+  function onMessageReceived(e) {
+    let msg = e.data;
+
+    msg.did_throw_exception = test(msg.api, msg.args);
+    if (msg.query) {
+      let el = document.querySelector(msg.query);
+      msg.value = el ? el.innerHTML : false;
+    }
+    ackMessage(msg, e.source);
+  }
+
+  function ackMessage(msg, source) {
+    source.postMessage(msg, "*");
+  }
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers
new file mode 100644
index 00000000000..32846f724a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/document-write-disallowed.html.headers
@@ -0,0 +1 @@
+Document-Policy: document-write=?0
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/parser-blocking-script.js b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/parser-blocking-script.js
similarity index 100%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/parser-blocking-script.js
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/resources/parser-blocking-script.js
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/sync-script-test.js b/tests/wpt/web-platform-tests/document-policy/experimental-features/resources/sync-script-test.js
similarity index 100%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/sync-script-test.js
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/resources/sync-script-test.js
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html b/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html
similarity index 65%
rename from tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html
rename to tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html
index 94f0dcf13fc..a199a4ed3f9 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html
@@ -15,8 +15,8 @@
 // before verifying the behavior.
 window.didExecuteInlineParsingBlockingScript = true;
 </script>
-<script src="/feature-policy/experimental-features/resources/parser-blocking-script.js"></script>
-<script async src="/feature-policy/experimental-features/resources/async-script.js"></script>
-<script defer src="/feature-policy/experimental-features/resources/defer-script.js"></script>
-<script defer src="/feature-policy/experimental-features/resources/sync-script-test.js"></script>
+<script src="/document-policy/experimental-features/resources/parser-blocking-script.js"></script>
+<script async src="/document-policy/experimental-features/resources/async-script.js"></script>
+<script defer src="/document-policy/experimental-features/resources/defer-script.js"></script>
+<script defer src="/document-policy/experimental-features/resources/sync-script-test.js"></script>
 </body>
diff --git a/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers b/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers
new file mode 100644
index 00000000000..cfe200c27b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/experimental-features/sync-script.tentative.https.sub.html.headers
@@ -0,0 +1 @@
+Document-Policy: sync-script=?0
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html
similarity index 83%
rename from tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html
rename to tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html
index 69ce9f82298..bf17807f4a9 100644
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "document-policy-violation");
   assert_equals(report.body.featureId, "document-write");
   assert_equals(report.body.disposition, "report");
 };
@@ -16,7 +16,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['document-policy-violation']}).observe();
   });
   document.write("This should be written into the document");
   check_report_format(await report);
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html.headers
new file mode 100644
index 00000000000..924dac8e87b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-report-only-tentative.html.headers
@@ -0,0 +1 @@
+Document-Policy-Report-Only: document-write=?0
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html
similarity index 87%
rename from tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html
rename to tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html
index 50af640e08e..65a584ce19d 100644
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html
@@ -10,7 +10,7 @@ var t = async_test("Document-write Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "document-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "document-write");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['document-policy-violation']}).observe();
 
 t.step_func(() => {
   assert_throws_dom('NotAllowedError',
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html.headers
new file mode 100644
index 00000000000..6d05e969b50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/document-write-reporting-tentative.html.headers
@@ -0,0 +1 @@
+Document-Policy: document-write=?0
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html
similarity index 91%
rename from tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html
rename to tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html
index 948c4352256..85e1349a19f 100644
--- a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html
@@ -13,7 +13,7 @@ var check_report_format = (reports, observer) => {
   let report = reports[0];
   assert_equals(report.type, "document-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.featureId, "unoptimized-lossy-images");
+  assert_equals(report.body.featureId, "lossy-images-max-bpp");
   assert_equals(report.body.disposition, "enforce");
 };
 
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers
new file mode 100644
index 00000000000..cb28d40ec15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-onload-tentative.html.headers
@@ -0,0 +1 @@
+Document-Policy: lossy-images-max-bpp=0.5
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html
similarity index 92%
rename from tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html
rename to tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html
index d4b8611a19d..b6876f4880f 100644
--- a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html
@@ -11,7 +11,7 @@ var check_report_format = (reports, observer) => {
   let report = reports[0];
   assert_equals(report.type, "document-policy-violation");
   assert_equals(report.url, document.location.href);
-  assert_equals(report.body.featureId, "unoptimized-lossy-images");
+  assert_equals(report.body.featureId, "lossy-images-max-bpp");
   assert_equals(report.body.disposition, "enforce");
   assert_equals(report.body.sourceFile, document.getElementsByTagName('img')[0].src);
   assert_equals(report.body.lineNumber, null);
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers
new file mode 100644
index 00000000000..cb28d40ec15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/reporting/lossy-images-max-bpp-reporting-tentative.html.headers
@@ -0,0 +1 @@
+Document-Policy: lossy-images-max-bpp=0.5
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting.html b/tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting.html
rename to tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting.html.headers
rename to tests/wpt/web-platform-tests/document-policy/reporting/oversized-images-reporting-tentative.html.headers
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers
deleted file mode 100644
index 3cad9badac3..00000000000
--- a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting-onload.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Document-Policy: unoptimized-lossy-images=0.5
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers
deleted file mode 100644
index 3cad9badac3..00000000000
--- a/tests/wpt/web-platform-tests/document-policy/reporting/unoptimized-lossy-images-reporting.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Document-Policy: unoptimized-lossy-images=0.5
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting.html b/tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting.html
rename to tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html
diff --git a/tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting.html.headers b/tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting.html.headers
rename to tests/wpt/web-platform-tests/document-policy/reporting/unsized-media-reporting-tentative.html.headers
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html b/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html
index b7fbceb2acd..aaa8d692001 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html
@@ -43,9 +43,9 @@ async_test(t => {
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=3";
-  iframe.policy = "unoptimized-lossless-images=4";
+  iframe.policy = "lossless-images-max-bpp=4";
   callbacks["3"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=4.0");
+    assert_equals(result, "lossless-images-max-bpp=4.0");
   });
   document.body.appendChild(iframe);
 }, "Child frame can have a required policy which is less strict than the parent document's policy.");
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html.headers b/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html.headers
index 8ea51b103f9..20629ac15f5 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html.headers
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/document-policy.html.headers
@@ -1 +1 @@
-Document-Policy: unoptimized-lossless-images=1.1
+Document-Policy: lossless-images-max-bpp=1.1
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy-nested.html b/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy-nested.html
index 15281fcc287..33de2533a25 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy-nested.html
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy-nested.html
@@ -34,29 +34,29 @@ async_test(t => {
 
 // Frame tree should be:
 // Top:
-//  <iframe policy="unoptimized-lossless-images=1.1">
+//  <iframe policy="lossless-images-max-bpp=1.1">
 //    <iframe>
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy-nested.html?id=2";
-  iframe.policy = "unoptimized-lossless-images=1.1";
+  iframe.policy = "lossless-images-max-bpp=1.1";
   callbacks["2"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.1");
+    assert_equals(result, "lossless-images-max-bpp=1.1");
   });
   document.body.appendChild(iframe);
 }, "test nested required document policy when set by nested frame");
 
 // Frame tree should be:
 // Top:
-//  <iframe policy="unoptimized-lossless-images=1.1">
+//  <iframe policy="lossless-images-max-bpp=1.1">
 //    <iframe>
 //      <iframe>
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy-nested.html?id=3&level=1";
-  iframe.policy = "unoptimized-lossless-images=1.1";
+  iframe.policy = "lossless-images-max-bpp=1.1";
   callbacks["3"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.1");
+    assert_equals(result, "lossless-images-max-bpp=1.1");
   });
   document.body.appendChild(iframe);
 }, "test nested required document policy when set by intermediate nested frame");
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html b/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html
index 99b64efab34..1058e3582ab 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html
@@ -26,7 +26,7 @@ async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=1";
   callbacks["1"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.1");
+    assert_equals(result, "lossless-images-max-bpp=1.1");
   });
   document.body.appendChild(iframe);
 }, "Child frame with no explicit policy should have the same required policy as its parent.");
@@ -34,9 +34,9 @@ async_test(t => {
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=2";
-  iframe.policy = "unoptimized-lossless-images=4";
+  iframe.policy = "lossless-images-max-bpp=4";
   callbacks["2"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.1");
+    assert_equals(result, "lossless-images-max-bpp=1.1");
   });
   document.body.appendChild(iframe);
 }, "Child frame with a less strict required policy should have the stricter value from the parent's policy applied.");
@@ -44,9 +44,9 @@ async_test(t => {
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=3";
-  iframe.policy = "unoptimized-lossless-images=1.0";
+  iframe.policy = "lossless-images-max-bpp=1.0";
   callbacks["3"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.0");
+    assert_equals(result, "lossless-images-max-bpp=1.0");
   });
   document.body.appendChild(iframe);
 }, "Child frame may have a stricter policy than the parent.");
@@ -56,7 +56,7 @@ async_test(t => {
   iframe.src = "/document-policy/echo-policy.py?id=4";
   iframe.policy = "font-display-late-swap=?0";
   callbacks["4"] = t.step_func_done(result => {
-    assert_equals(result, "font-display-late-swap=?0, unoptimized-lossless-images=1.1");
+    assert_equals(result, "font-display-late-swap=?0, lossless-images-max-bpp=1.1");
   });
   document.body.appendChild(iframe);
 }, "Any unrelated policy directives should combine with the parent's required policy.");
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html.headers b/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html.headers
index 7f5cd92a482..ac1bf268b50 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html.headers
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/required-document-policy.html.headers
@@ -1 +1 @@
-Require-Document-Policy: unoptimized-lossless-images=1.1
+Require-Document-Policy: lossless-images-max-bpp=1.1
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html b/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html
index 347d0a9d92c..1ed94a81e74 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html
@@ -25,7 +25,7 @@ async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=1";
   callbacks["1"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.0");
+    assert_equals(result, "lossless-images-max-bpp=1.0");
   });
   document.body.appendChild(iframe);
 }, "Child frame with no explicit policy should have the same required policy as its parent.");
@@ -33,9 +33,9 @@ async_test(t => {
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=2";
-  iframe.policy = "unoptimized-lossless-images=4";
+  iframe.policy = "lossless-images-max-bpp=4";
   callbacks["2"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=1.0");
+    assert_equals(result, "lossless-images-max-bpp=1.0");
   });
   document.body.appendChild(iframe);
 }, "Child frame with a less strict required policy should have the stricter value from the parent's policy applied.");
@@ -43,9 +43,9 @@ async_test(t => {
 async_test(t => {
   var iframe = document.createElement('iframe');
   iframe.src = "/document-policy/echo-policy.py?id=3";
-  iframe.policy = "unoptimized-lossless-images=0.9";
+  iframe.policy = "lossless-images-max-bpp=0.9";
   callbacks["3"] = t.step_func_done(result => {
-    assert_equals(result, "unoptimized-lossless-images=0.9");
+    assert_equals(result, "lossless-images-max-bpp=0.9");
   });
   document.body.appendChild(iframe);
 }, "Child frame may have a stricter policy than the parent.");
@@ -55,7 +55,7 @@ async_test(t => {
   iframe.src = "/document-policy/echo-policy.py?id=4";
   iframe.policy = "no-font-display-late-swap";
   callbacks["4"] = t.step_func_done(result => {
-    assert_equals(result, "no-font-display-late-swap, unoptimized-lossless-images=1.0");
+    assert_equals(result, "no-font-display-late-swap, lossless-images-max-bpp=1.0");
   });
   document.body.appendChild(iframe);
 }, "Any unrelated policy directives should combine with the parent's required policy.");
diff --git a/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html.headers b/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html.headers
index c90842175d9..3c593a32aa1 100644
--- a/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html.headers
+++ b/tests/wpt/web-platform-tests/document-policy/required-policy/separate-document-policies.html.headers
@@ -1,2 +1,2 @@
-Document-Policy: unoptimized-lossless-images=1.1
-Require-Document-Policy: unoptimized-lossless-images=1.0
+Document-Policy: lossless-images-max-bpp=1.1
+Require-Document-Policy: lossless-images-max-bpp=1.0
diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
index 4b071030271..148f4f50d41 100644
--- a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
+++ b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.html
@@ -241,6 +241,54 @@ async_test(t => {
   input.dispatchEvent(new MouseEvent("click"));
 }, `disabled radio should fire onclick`);
 
+async_test(t => {
+  const input = document.createElement("input");
+  input.type = "checkbox";
+  input.disabled = true;
+  input.onclick = t.step_func(ev => {
+    assert_true(input.checked);
+    ev.preventDefault();
+    queueMicrotask(t.step_func_done(() => {
+      assert_false(input.checked);
+    }));
+  });
+  input.dispatchEvent(new MouseEvent("click", { cancelable: true }));
+}, `disabled checkbox should get legacy-canceled-activation behavior`);
+
+async_test(t => {
+  const input = document.createElement("input");
+  input.type = "radio";
+  input.disabled = true;
+  input.onclick = t.step_func(ev => {
+    assert_true(input.checked);
+    ev.preventDefault();
+    queueMicrotask(t.step_func_done(() => {
+      assert_false(input.checked);
+    }));
+  });
+  input.dispatchEvent(new MouseEvent("click", { cancelable: true }));
+}, `disabled radio should get legacy-canceled-activation behavior`);
+
+test(t => {
+  const input = document.createElement("input");
+  input.type = "checkbox";
+  input.disabled = true;
+  const ev = new MouseEvent("click", { cancelable: true });
+  ev.preventDefault();
+  input.dispatchEvent(ev);
+  assert_false(input.checked);
+}, `disabled checkbox should get legacy-canceled-activation behavior 2`);
+
+test(t => {
+  const input = document.createElement("input");
+  input.type = "radio";
+  input.disabled = true;
+  const ev = new MouseEvent("click", { cancelable: true });
+  ev.preventDefault();
+  input.dispatchEvent(ev);
+  assert_false(input.checked);
+}, `disabled radio should get legacy-canceled-activation behavior 2`);
+
 async_test(function(t) {
   var form = document.createElement("form")
   var didSubmit = false
diff --git a/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.tentative.html b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.tentative.html
new file mode 100644
index 00000000000..01ce1936a8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/events/Event-dispatch-click.tentative.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<title>Clicks on input element</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=dump style=display:none></div>
+<script>
+var dump = document.getElementById("dump")
+
+test(t => {
+  const input = document.createElement("input");
+  input.type = "checkbox";
+  input.disabled = true;
+  const label = document.createElement("label");
+  label.append(input);
+  dump.append(label);
+  label.click();
+  assert_false(input.checked);
+}, "disabled checkbox should not be checked from label click");
+
+test(t => {
+  const input = document.createElement("input");
+  input.type = "radio";
+  input.disabled = true;
+  const label = document.createElement("label");
+  label.append(input);
+  dump.append(label);
+  label.click();
+  assert_false(input.checked);
+}, "disabled radio should not be checked from label click");
+
+test(t => {
+  const input = document.createElement("input");
+  input.type = "checkbox";
+  input.disabled = true;
+  const label = document.createElement("label");
+  label.append(input);
+  dump.append(label);
+  label.dispatchEvent(new MouseEvent("click"));
+  assert_false(input.checked);
+}, "disabled checkbox should not be checked from label click by dispatchEvent");
+
+test(t => {
+  const input = document.createElement("input");
+  input.type = "radio";
+  input.disabled = true;
+  const label = document.createElement("label");
+  label.append(input);
+  dump.append(label);
+  label.dispatchEvent(new MouseEvent("click"));
+  assert_false(input.checked);
+}, "disabled radio should not be checked from label click by dispatchEvent");
+</script>
diff --git a/tests/wpt/web-platform-tests/editing/other/recursive-exec-command-calls.tentative.html b/tests/wpt/web-platform-tests/editing/other/recursive-exec-command-calls.tentative.html
new file mode 100644
index 00000000000..60a3b03099f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/editing/other/recursive-exec-command-calls.tentative.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>Test recursive `Document.execCommand()` calls</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div contenteditable><br></div>
+<script>
+"use strict";
+
+setup({explicit_done: true});
+
+/**
+ * This test checks whether the browser allows or disallows recursive
+ * Document.execCommand() calls.
+ * https://github.com/w3c/editing/issues/200#issuecomment-578097441
+ */
+function runTests() {
+  test(function () {
+    let editor = document.querySelector("div[contenteditable]");
+    editor.focus();
+    let counter = 0;
+    editor.addEventListener("input", event => {
+      if (++counter < 10) {
+        let result = document.execCommand("insertText", false, `, ${counter}`);
+        assert_false(result,
+            '`execCommand("insertText") in the "input" event listener should return `false`');
+      }
+    });
+    document.execCommand("insertText", false, "0");
+    assert_equals(editor.textContent, "0",
+        '`execCommand("insertText") in the "input" event listener should do nothing');
+  }, "Recursive `Document.execCommand()` shouldn't be supported");
+  done();
+}
+
+window.addEventListener("load", runTests, {once: true});
+</script>
diff --git a/tests/wpt/web-platform-tests/entries-api/idlharness-manual.html b/tests/wpt/web-platform-tests/entries-api/idlharness-manual.html
deleted file mode 100644
index 72bdf67dfa6..00000000000
--- a/tests/wpt/web-platform-tests/entries-api/idlharness-manual.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Entries API: IDL Tests</title>
-<link rel=help href="https://wicg.github.io/entries-api/#idl-index">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<script src="support.js"></script>
-<script>
-'use strict';
-
-entry_test((t, entry, item) => {
-  assert_true(entry.isDirectory);
-  Promise.all([
-    getEntriesAsPromise(entry),
-    fetch('/interfaces/entries-api.idl').then(r => r.text())
-  ]).then(t.step_func(([entries, idls]) => {
-    window.samples = {
-      item: item,
-      dirEntry: entries.filter(entry => entry.isDirectory)[0],
-      fileEntry: entries.filter(entry => entry.isFile)[0],
-      fileSystem: entry.filesystem,
-    };
-
-    const idl_array = new IdlArray();
-
-    // https://w3c.github.io/FileAPI/#dfn-file
-    idl_array.add_untested_idls('[Exposed=(Window,Worker)] interface File {};');
-
-    // https://html.spec.whatwg.org/multipage/forms.html#htmlinputelement
-    idl_array.add_untested_idls('interface HTMLInputElement {};');
-
-    // https://html.spec.whatwg.org/multipage/interaction.html#datatransferitem
-    idl_array.add_untested_idls('interface DataTransferItem {};');
-
-    idl_array.add_idls(idls);
-
-    idl_array.add_objects({
-      File: ['new File([], "example.txt")'],
-      HTMLInputElement: ['document.createElement("input")'],
-      DataTransferItem: ['samples.item'],
-      FileSystemEntry: [],
-      FileSystemDirectoryEntry: ['samples.dirEntry'],
-      FileSystemDirectoryReader: ['samples.dirEntry.createReader()'],
-      FileSystemFileEntry: ['samples.fileEntry'],
-      FileSystem: ['samples.fileSystem'],
-    });
-
-    idl_array.test();
-    t.done();
-  }));
-}, 'Entries API: IDL');
-</script>
diff --git a/tests/wpt/web-platform-tests/entries-api/idlharness-manual.window.js b/tests/wpt/web-platform-tests/entries-api/idlharness-manual.window.js
new file mode 100644
index 00000000000..9f2731bf1d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/entries-api/idlharness-manual.window.js
@@ -0,0 +1,46 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: script=support.js
+
+'use strict';
+
+let resolve;
+let globalItem;
+let globalEntry;
+
+let entriesPromise = new Promise(r => {
+  resolve = r;
+});
+
+entry_test((t, entry, item) => {
+  assert_true(entry.isDirectory);
+  resolve(getEntriesAsPromise(entry));
+  globalItem = item;
+  globalEntry = entry;
+  t.done();
+});
+
+idl_test(
+  ['entries-api'],
+  ['FileAPI', 'html', 'dom'],
+  async idl_array => {
+    const entries = await entriesPromise;
+    window.samples = {
+      item: globalItem,
+      dirEntry: entries.filter(entry => entry.isDirectory)[0],
+      fileEntry: entries.filter(entry => entry.isFile)[0],
+      fileSystem: globalEntry.filesystem,
+    };
+
+    idl_array.add_objects({
+      File: ['new File([], "example.txt")'],
+      HTMLInputElement: ['document.createElement("input")'],
+      DataTransferItem: ['samples.item'],
+      FileSystemEntry: [],
+      FileSystemDirectoryEntry: ['samples.dirEntry'],
+      FileSystemDirectoryReader: ['samples.dirEntry.createReader()'],
+      FileSystemFileEntry: ['samples.fileEntry'],
+      FileSystem: ['samples.fileSystem'],
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/entries-api/idlharness.html b/tests/wpt/web-platform-tests/entries-api/idlharness.html
deleted file mode 100644
index 091549eb2dc..00000000000
--- a/tests/wpt/web-platform-tests/entries-api/idlharness.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Entries API: IDL Tests</title>
-<link rel=help href="https://wicg.github.io/entries-api/#idl-index">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<script>
-'use strict';
-
-promise_test(t => {
-  return fetch('/interfaces/entries-api.idl')
-    .then(r => r.text())
-    .then(idls => {
-
-      const idl_array = new IdlArray();
-
-      // https://w3c.github.io/FileAPI/#dfn-file
-      idl_array.add_untested_idls('[Exposed=(Window,Worker)] interface File {};');
-
-      // https://html.spec.whatwg.org/multipage/forms.html#htmlinputelement
-      idl_array.add_untested_idls('interface HTMLInputElement {};');
-
-      // https://html.spec.whatwg.org/multipage/interaction.html#datatransferitem
-      idl_array.add_untested_idls('interface DataTransferItem {};');
-
-      idl_array.add_idls(idls);
-
-      idl_array.add_objects({
-        File: ['new File([], "example.txt")'],
-        HTMLInputElement: ['document.createElement("input")'],
-      });
-
-      idl_array.test();
-    });
-
-}, 'Entries API: IDL');
-</script>
diff --git a/tests/wpt/web-platform-tests/entries-api/idlharness.window.js b/tests/wpt/web-platform-tests/entries-api/idlharness.window.js
new file mode 100644
index 00000000000..32527be514a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/entries-api/idlharness.window.js
@@ -0,0 +1,15 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+idl_test(
+  ['entries-api'],
+  ['FileAPI', 'html', 'dom'],
+  idl_array => {
+    idl_array.add_objects({
+      File: ['new File([], "example.txt")'],
+      HTMLInputElement: ['document.createElement("input")'],
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/eventsource/README.md b/tests/wpt/web-platform-tests/eventsource/README.md
index 60bbea3f3b9..e19a0ba6c74 100644
--- a/tests/wpt/web-platform-tests/eventsource/README.md
+++ b/tests/wpt/web-platform-tests/eventsource/README.md
@@ -1,2 +1,4 @@
 These are the Server-sent events (`EventSource`) tests for the
 [Server-sent events chapter of the HTML Standard](https://html.spec.whatwg.org/multipage/comms.html#server-sent-events).
+
+IDL tests are part of the `/html/dom/idlharness.*` resources.
diff --git a/tests/wpt/web-platform-tests/eventsource/idlharness.html b/tests/wpt/web-platform-tests/eventsource/idlharness.html
deleted file mode 100644
index 2935927fd32..00000000000
--- a/tests/wpt/web-platform-tests/eventsource/idlharness.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!doctype html>
-<title>EventSource IDL tests</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-
-<h1>EventSource IDL tests</h1>
-<div id=log></div>
-
-<script type=text/plain>
-[Constructor(), Exposed=(Window,Worker)]
-interface EventTarget {
-  void addEventListener(DOMString type, EventListener? listener, optional (AddEventListenerOptions or boolean) options);
-  void removeEventListener(DOMString type, EventListener? listener, optional (EventListenerOptions or boolean) options);
-  boolean dispatchEvent(Event event);
-};
-callback interface EventListener {
-  void handleEvent(Event event);
-};
-dictionary EventListenerOptions {
-  boolean capture = false;
-};
-dictionary AddEventListenerOptions : EventListenerOptions {
-  boolean passive = false;
-  boolean once = false;
-};
-[Constructor(DOMString url, optional EventSourceInit eventSourceInitDict)]
-interface EventSource : EventTarget {
-  readonly attribute DOMString url;
-  readonly attribute boolean withCredentials;
-
-  // ready state
-  const unsigned short CONNECTING = 0;
-  const unsigned short OPEN = 1;
-  const unsigned short CLOSED = 2;
-  readonly attribute unsigned short readyState;
-
-  // networking
-           attribute EventHandler onopen;
-           attribute EventHandler onmessage;
-           attribute EventHandler onerror;
-  void close();
-};
-
-dictionary EventSourceInit {
-  boolean withCredentials = false;
-};
-
-[TreatNonCallableAsNull]
-callback EventHandlerNonNull = any (Event event);
-typedef EventHandlerNonNull? EventHandler;
-</script>
-<script>
-"use strict";
-var idlArray;
-setup(function() {
-  idlArray = new IdlArray();
-  [].forEach.call(document.querySelectorAll("script[type=text\\/plain]"), function(node) {
-    if (node.className == "untested") {
-      idlArray.add_untested_idls(node.textContent);
-    } else {
-      idlArray.add_idls(node.textContent);
-    }
-  });
-}, {explicit_done:true});
-window.onload = function() {
-  idlArray.add_objects({
-    EventSource: ['new EventSource("http://foo")'],
-  });
-  idlArray.test();
-  done();
-};
-</script>
diff --git a/tests/wpt/web-platform-tests/feature-policy/README.md b/tests/wpt/web-platform-tests/feature-policy/README.md
index 48cb95ebf74..646fc1e0bec 100644
--- a/tests/wpt/web-platform-tests/feature-policy/README.md
+++ b/tests/wpt/web-platform-tests/feature-policy/README.md
@@ -5,7 +5,7 @@ This directory contains a framework to test features with feature policy.
 
 When adding a new feature to feature policy, the following cases should be tested:
 * feature enabled by header policy [HTTP tests]
-    + test when feature is enabled by feature policy HTTP headerr;
+    + test when feature is enabled by feature policy HTTP header;
 * feature disabled by header policy [HTTP tests]
     + test when feature is disabled by feature policy HTTP header;
 * feature enabled on self origin by header policy [HTTP tests]
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html.headers b/tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html.headers
deleted file mode 100644
index b468c8b1822..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/sync-script.tentative.https.sub.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy: sync-script 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html.headers
deleted file mode 100644
index bd1418700c2..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-report-only.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: document-write 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html.headers
deleted file mode 100644
index 57102d5ee7c..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/document-write-reporting.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy: document-write 'none'
diff --git a/tests/wpt/web-platform-tests/fetch/api/basic/request-headers-nonascii.any.js b/tests/wpt/web-platform-tests/fetch/api/basic/request-headers-nonascii.any.js
new file mode 100644
index 00000000000..0d822fb24f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/basic/request-headers-nonascii.any.js
@@ -0,0 +1,27 @@
+// This tests characters that are not
+// https://infra.spec.whatwg.org/#ascii-code-point
+// but are still
+// https://infra.spec.whatwg.org/#byte-value
+// in request header values.
+// Such request header values are valid and thus sent to servers.
+// Characters outside the #byte-value range are tested e.g. in
+// fetch/api/headers/headers-errors.html.
+
+promise_test(() => {
+  return fetch(
+    "../resources/inspect-headers.py?headers=accept|x-test",
+    {headers: {
+      "Accept": "before-æøå-after",
+      "X-Test": "before-ß-after"
+    }})
+    .then(res => {
+      assert_equals(
+          res.headers.get("x-request-accept"),
+          "before-æøå-after",
+          "Accept Header");
+      assert_equals(
+          res.headers.get("x-request-x-test"),
+          "before-ß-after",
+          "X-Test Header");
+    });
+}, "Non-ascii bytes in request headers");
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/request-structure.html b/tests/wpt/web-platform-tests/fetch/api/request/request-structure.html
index 806606cf627..e137a7ea512 100644
--- a/tests/wpt/web-platform-tests/fetch/api/request/request-structure.html
+++ b/tests/wpt/web-platform-tests/fetch/api/request/request-structure.html
@@ -58,7 +58,7 @@
             break;
 
           case "destination":
-            defaultValue = "empty";
+            defaultValue = "";
             newValue = "worker";
             break;
 
diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-body-read-task-handling.html b/tests/wpt/web-platform-tests/fetch/api/response/response-body-read-task-handling.html
new file mode 100644
index 00000000000..c2c90eaa8bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/response/response-body-read-task-handling.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title></title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <script>
+function performMicrotaskCheckpoint() {
+    document.createNodeIterator(document, -1, {
+        acceptNode() {
+            return NodeFilter.FILTER_ACCEPT;
+        }
+    }).nextNode();
+}
+
+promise_test(function() {
+    return fetch("../resources/data.json").then(function(response) {
+        // Add a getter for "then" that will incidentally be invoked
+        // during promise resolution.
+        Object.prototype.__defineGetter__('then', () => {
+            // Clean up behind ourselves.
+            delete Object.prototype.then;
+
+            // This promise should (like all promises) be resolved
+            // asynchronously.
+            var executed = false;
+            Promise.resolve().then(_ => { executed = true; });
+
+            // This shouldn't run microtasks!  They should only run
+            // after the fetch is resolved.
+            performMicrotaskCheckpoint();
+
+            // The fulfill handler above shouldn't have run yet.  If it has run,
+            // throw to reject this promise and fail the test.
+            if (executed) {
+                throw "shouldn't have run microtasks yet";
+            }
+
+            // Otherwise act as if there's no "then" property so the promise
+            // fulfills and the test passes.
+            return undefined;
+        });
+
+        // Create a read request, incidentally resolving a promise with an
+        // object value, thereby invoking the getter installed above.
+        return response.body.getReader().read();
+    });
+}, "reading from a body stream should occur in a microtask scope");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/cache-mode.html b/tests/wpt/web-platform-tests/fetch/http-cache/cache-mode.html
new file mode 100644
index 00000000000..ea5bbad0188
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/http-cache/cache-mode.html
@@ -0,0 +1,72 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Fetch - Cache Mode</title>
+    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
+    <meta name="timeout" content="long">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/utils.js"></script>
+    <script src="/common/get-host-info.sub.js"></script>
+    <script src="http-cache.js"></script>
+  </head>
+  <body>
+    <script>
+    var tests = [
+      {
+        name: "Fetch sends Cache-Control: max-age=0 when cache mode is no-cache",
+        requests: [
+          {
+            cache: "no-cache",
+            expected_request_headers: [['cache-control', 'max-age=0']]
+          }
+        ]
+      },
+      {
+        name: "Fetch doesn't touch Cache-Control when cache mode is no-cache and Cache-Control is already present",
+        requests: [
+          {
+            cache: "no-cache",
+            request_headers: [['cache-control', 'foo']],
+            expected_request_headers: [['cache-control', 'foo']]
+          }
+        ]
+      },
+      {
+        name: "Fetch sends Cache-Control: no-cache and Pragma: no-cache when cache mode is no-store",
+        requests: [
+          {
+            cache: "no-store",
+            expected_request_headers: [
+              ['cache-control', 'no-cache'],
+              ['pragma', 'no-cache']
+            ]
+          }
+        ]
+      },
+      {
+        name: "Fetch doesn't touch Cache-Control when cache mode is no-store and Cache-Control is already present",
+        requests: [
+          {
+            cache: "no-store",
+            request_headers: [['cache-control', 'foo']],
+            expected_request_headers: [['cache-control', 'foo']]
+          }
+        ]
+      },
+      {
+        name: "Fetch doesn't touch Pragma when cache mode is no-store and Pragma is already present",
+        requests: [
+          {
+            cache: "no-store",
+            request_headers: [['pragma', 'foo']],
+            expected_request_headers: [['pragma', 'foo']]
+          }
+        ]
+      }
+    ];
+    run_tests(tests);
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.tentative.html
similarity index 92%
rename from tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.html
rename to tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.tentative.html
index 8a59b821b45..1900dbdf081 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/embed.https.sub.tentative.html
@@ -6,6 +6,11 @@
 <script src=/fetch/metadata/resources/helper.js></script>
 <script src=/common/utils.js></script>
 <body>
+
+<p>Relevant issue: <a href="https://github.com/whatwg/html/issues/513">
+&lt;embed> should support loading random HTML documents, like &lt;object>
+</a></p>
+
 <script>
   const nonce = token();
 
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/portal.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/portal.https.sub.html
index 8403a296fe1..55b555a1b8e 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/portal.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/portal.https.sub.html
@@ -5,6 +5,7 @@
 <script src=/resources/testdriver-vendor.js></script>
 <script src=/fetch/metadata/resources/helper.js></script>
 <script src=/common/utils.js></script>
+<script src=/portals/resources/stash-utils.sub.js></script>
 <body>
 <script>
   const USER = true;
@@ -15,12 +16,12 @@
       assert_implements("HTMLPortalElement" in window, "Portals are not supported.");
 
       let p = document.createElement('portal');
-      p.addEventListener('message', t.step_func(e => {
-        assert_header_equals(e.data, expectations, `{{host}} -> ${host} portal`);
-        t.done();
+      const key = token();
+      StashUtils.takeValue(key).then(t.step_func_done(value => {
+        assert_header_equals(value, expectations, `{{host}} -> ${host} portal`);
       }));
 
-      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py`;
+      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py?key=${key}`;
       p.src = url;
       document.body.appendChild(p);
     }, `{{host}} -> ${host} portal`);
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py b/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py
index c5ee11653ef..4890c49acbd 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/post-to-owner.py
@@ -7,22 +7,26 @@ def main(request, response):
         (b"Content-Type", b"text/html"),
         (b"Cache-Control", b"no-cache, no-store, must-revalidate")
     ]
+    key = request.GET.first(b"key", None)
 
     body = u"""
         <!DOCTYPE html>
+        <script src="/portals/resources/stash-utils.sub.js"></script>
         <script>
             var data = %s;
             if (window.opener)
                 window.opener.postMessage(data, "*");
             if (window.top != window)
                 window.top.postMessage(data, "*");
-            if (window.portalHost)
-                window.portalHost.postMessage(data, "*");
+
+            const key = %s;
+            if (key)
+                StashUtils.putValue(key, data);
         </script>
-    """ % json.dumps({
+    """ % (json.dumps({
         u"dest": isomorphic_decode(request.headers.get(b"sec-fetch-dest", b"")),
         u"mode": isomorphic_decode(request.headers.get(b"sec-fetch-mode", b"")),
         u"site": isomorphic_decode(request.headers.get(b"sec-fetch-site", b"")),
         u"user": isomorphic_decode(request.headers.get(b"sec-fetch-user", b"")),
-        })
+        }), json.dumps(key))
     return headers, body
diff --git a/tests/wpt/web-platform-tests/fetch/range/sw.https.window.js b/tests/wpt/web-platform-tests/fetch/range/sw.https.window.js
index 625e513a813..76f80e9416c 100644
--- a/tests/wpt/web-platform-tests/fetch/range/sw.https.window.js
+++ b/tests/wpt/web-platform-tests/fetch/range/sw.https.window.js
@@ -86,11 +86,11 @@ promise_test(async t => {
 
   // Fetching should reject
   const fetchPromise = w.fetch('?action=use-stored-ranged-response', { mode: 'no-cors' });
-  promise_rejects_js(t, TypeError, fetchPromise);
+  await promise_rejects_js(t, w.TypeError, fetchPromise);
 
   // Script loading should error too
   const loadScriptPromise = loadScript('?action=use-stored-ranged-response', { doc: w.document });
-  promise_rejects_js(t, Error, loadScriptPromise);
+  await promise_rejects_js(t, Error, loadScriptPromise);
 
   await loadScriptPromise.catch(() => {});
 
diff --git a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-image.html b/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-image.html
index f90e293bc40..d86bdfbde2c 100644
--- a/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-image.html
+++ b/tests/wpt/web-platform-tests/fetch/stale-while-revalidate/stale-image.html
@@ -10,13 +10,14 @@ Use a child document to load the second stale image into because
 an image loaded into the same document will skip cache-control headers.
 See: https://html.spec.whatwg.org/#the-list-of-available-images
 -->
-<iframe id="child" srcdoc=""></iframe>
+<iframe id="child1" srcdoc=""></iframe>
+<iframe id="child2" srcdoc=""></iframe>
 <script>
 
 var request_token = token();
 let image_src = "resources/stale-image.py?token=" + request_token;
 
-let loadImage = async () => {
+let loadImage = async (document) => {
   let img = document.createElement("img");
   img.src = image_src;
   let loaded = new Promise(r => img.onload = r);
@@ -28,10 +29,10 @@ let loadImage = async () => {
 promise_test(async t => {
   await new Promise(r => window.onload = r);
 
-  let img1 = await loadImage();
+  let img1 = await loadImage(document);
   assert_equals(img1.width, 16, "(initial version loaded)");
 
-  let img2 = await loadImage();
+  let img2 = await loadImage(child1.contentDocument);
   assert_equals(img2.width, 16, "(stale version loaded)");
 
   // Query the server again and again. At some point it must have received the
@@ -45,7 +46,7 @@ promise_test(async t => {
       break;
   }
 
-  let img3 = await loadImage();
+  let img3 = await loadImage(child2.contentDocument);
   assert_equals(img3.width, 256, "(revalidated version loaded)");
 
 }, 'Cache returns stale resource');
diff --git a/tests/wpt/web-platform-tests/font-access/README.md b/tests/wpt/web-platform-tests/font-access/README.md
new file mode 100644
index 00000000000..f0d654ed398
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/README.md
@@ -0,0 +1,2 @@
+This directory contains (tentative) tests for the
+[Font Access](https://wicg.github.io/local-font-access/) specification.
diff --git a/tests/wpt/web-platform-tests/font-access/font_access-blob.tentative.https.window.js b/tests/wpt/web-platform-tests/font-access/font_access-blob.tentative.https.window.js
new file mode 100644
index 00000000000..ff90075c966
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/font_access-blob.tentative.https.window.js
@@ -0,0 +1,4 @@
+//META: script=/resources/testdriver.js
+//META: script=/resources/testdriver-vendor.js
+//META: script=resources/test-expectations.js
+//META: script=resources/window-tests-blob.js
diff --git a/tests/wpt/web-platform-tests/font-access/font_access-enumeration.tentative.https.window.js b/tests/wpt/web-platform-tests/font-access/font_access-enumeration.tentative.https.window.js
new file mode 100644
index 00000000000..677fe82c702
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/font_access-enumeration.tentative.https.window.js
@@ -0,0 +1,4 @@
+//META: script=/resources/testdriver.js
+//META: script=/resources/testdriver-vendor.js
+//META: script=resources/test-expectations.js
+//META: script=resources/window-tests-enumeration.js
diff --git a/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js b/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
new file mode 100644
index 00000000000..6baaeb8ea26
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/resources/test-expectations.js
@@ -0,0 +1,481 @@
+'use strict';
+
+const TEST_SIZE_CATEGORY = {
+  // Fonts with file smaller than 1MiB.
+  small: 'small',
+  // Fonts with file between 1 and 20MiB.
+  medium: 'medium',
+  // Fonts with file larger than 20MiB.
+  large: 'large',
+};
+
+const MAC_FONTS = [
+  {
+    postscriptName: 'Monaco',
+    fullName: 'Monaco',
+    family: 'Monaco',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      // Tables related to TrueType.
+      'cvt ', 'glyf', 'loca', 'prep', 'gasp',
+    ],
+  },
+  {
+    postscriptName: 'Menlo-Regular',
+    fullName: 'Menlo Regular',
+    family: 'Menlo',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  {
+    postscriptName: 'Menlo-Bold',
+    fullName: 'Menlo Bold',
+    family: 'Menlo',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  {
+    postscriptName: 'Menlo-BoldItalic',
+    fullName: 'Menlo Bold Italic',
+    family: 'Menlo',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  // Indic.
+  {
+    postscriptName: 'GujaratiMT',
+    fullName: 'Gujarati MT',
+    family: 'Gujarati MT',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  {
+    postscriptName: 'GujaratiMT-Bold',
+    fullName: 'Gujarati MT Bold',
+    family: 'Gujarati MT',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  {
+    postscriptName: 'DevanagariMT',
+    fullName: 'Devanagari MT',
+    family: 'Devanagari MT',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  {
+    postscriptName: 'DevanagariMT-Bold',
+    fullName: 'Devanagari MT Bold',
+    family: 'Devanagari MT',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  // Japanese.
+  {
+    postscriptName: 'HiraMinProN-W3',
+    fullName: 'Hiragino Mincho ProN W3',
+    family: 'Hiragino Mincho ProN',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'CFF ', 'VORG',
+    ],
+  },
+  {
+    postscriptName: 'HiraMinProN-W6',
+    fullName: 'Hiragino Mincho ProN W6',
+    family: 'Hiragino Mincho ProN',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'CFF ', 'VORG',
+    ],
+  },
+  // Korean.
+  {
+    postscriptName: 'AppleGothic',
+    fullName: 'AppleGothic Regular',
+    family: 'AppleGothic',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca',
+    ],
+  },
+  {
+    postscriptName: 'AppleMyungjo',
+    fullName: 'AppleMyungjo Regular',
+    family: 'AppleMyungjo',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca',
+    ],
+  },
+  // Chinese.
+  {
+    postscriptName: 'STHeitiTC-Light',
+    fullName: 'Heiti TC Light',
+    family: 'Heiti TC',
+    label: TEST_SIZE_CATEGORY.large,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  {
+   postscriptName: 'STHeitiTC-Medium',
+    fullName: 'Heiti TC Medium',
+    family: 'Heiti TC',
+    label: TEST_SIZE_CATEGORY.large,
+    expectedTables: [
+      'cvt ', 'glyf', 'loca', 'prep',
+    ],
+  },
+  // Bitmap.
+  {
+    postscriptName: 'AppleColorEmoji',
+    fullName: 'Apple Color Emoji',
+    family: 'Apple Color Emoji',
+    label: TEST_SIZE_CATEGORY.large,
+    expectedTables: [
+      'glyf', 'loca',
+      // Tables related to Bitmap Glyphs.
+      'sbix',
+    ],
+  },
+];
+
+const WIN_FONTS = [
+  {
+    postscriptName: 'Verdana',
+    fullName: 'Verdana',
+    family: 'Verdana',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      // Tables related to TrueType.
+      'cvt ',
+      'glyf',
+      'loca',
+      'prep',
+      'gasp',
+    ],
+  },
+  {
+    postscriptName: 'Verdana-Bold',
+    fullName: 'Verdana Bold',
+    family: 'Verdana',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      // Tables related to TrueType.
+      'cvt ',
+      'glyf',
+      'loca',
+      'prep',
+      'gasp',
+    ],
+  },
+  {
+    postscriptName: 'Verdana-Italic',
+    fullName: 'Verdana Italic',
+    family: 'Verdana',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      // Tables related to TrueType.
+      'cvt ',
+      'glyf',
+      'loca',
+      'prep',
+      'gasp',
+    ],
+  },
+  // Korean.
+  {
+    postscriptName: 'MalgunGothicBold',
+    fullName: 'Malgun Gothic Bold',
+    family: 'Malgun Gothic',
+    label: TEST_SIZE_CATEGORY.medium,
+    expectedTables: [
+      // Tables related to TrueType.
+      'cvt ',
+      'glyf',
+      'loca',
+      'prep',
+      'gasp',
+    ],
+  },
+  // Chinese.
+  {
+    postscriptName: 'MicrosoftYaHei',
+    fullName: 'Microsoft YaHei',
+    family: 'Microsoft YaHei',
+    label: TEST_SIZE_CATEGORY.medium,
+  },
+  {
+    postscriptName: 'MicrosoftYaHei-Bold',
+    fullName: 'Microsoft YaHei Bold',
+    family: 'Microsoft YaHei',
+    label: TEST_SIZE_CATEGORY.medium,
+  },
+];
+
+const LINUX_FONTS = [
+  {
+    postscriptName: 'Ahem',
+    fullName: 'Ahem',
+    family: 'Ahem',
+    label: TEST_SIZE_CATEGORY.small,
+    expectedTables: [
+      // Tables related to TrueType.
+      'cvt ',
+      'glyf',
+      'loca',
+      'prep',
+      'gasp',
+    ],
+  },
+];
+
+// The OpenType spec mentions that the follow tables are required for a font to
+// function correctly. We'll have all the tables listed except for OS/2, which
+// is not present in all fonts on Mac OS.
+// https://docs.microsoft.com/en-us/typography/opentype/spec/otff#font-tables
+const BASE_TABLES = [
+  'cmap',
+  'head',
+  'hhea',
+  'hmtx',
+  'maxp',
+  'name',
+  'post',
+];
+
+function getEnumerationTestSet(options) {
+  options = Object.assign({
+    labelFilter: [],
+  }, options);
+
+  // Verify (by font family) that some standard fonts have been returned.
+  let platform;
+  if (navigator.platform.indexOf("Win") !== -1) {
+    platform = 'win';
+  } else if (navigator.platform.indexOf("Mac") !== -1) {
+    platform = 'mac';
+  } else if (navigator.platform.indexOf("Linux") !== -1) {
+    platform = 'linux';
+  } else {
+    platform = 'generic';
+  }
+
+  assert_not_equals(platform, 'generic', 'Platform must be detected.');
+
+  let output = [];
+  if (platform === 'mac') {
+    output = MAC_FONTS;
+  } else if (platform === 'win') {
+    output = WIN_FONTS;
+  } else if (platform === 'linux') {
+    // Also includes ChromeOS, on which navigator.platform starts with 'Linux'.
+    output = LINUX_FONTS;
+  }
+
+  if (options.labelFilter.length && output.length) {
+    const labelFilter = new Set(options.labelFilter);
+    output = output.filter(f => labelFilter.has(f.label));
+  }
+
+  return output;
+}
+
+function getMoreExpectedTables(expectations) {
+  const output = {};
+  for (const f of expectations) {
+    if (f.expectedTables) {
+      output[f.postscriptName] = f.expectedTables;
+    }
+  }
+  return output;
+}
+
+async function filterEnumeration(iterator, expectedFonts) {
+  const nameSet = new Set();
+  for (const e of expectedFonts) {
+    nameSet.add(e.postscriptName);
+  }
+
+  const output = [];
+  for await (const f of iterator) {
+    if (nameSet.has(f.postscriptName)) {
+      output.push(f);
+    }
+  }
+
+  const numGot = output.length;
+  const numExpected = Object.keys(expectedFonts).length;
+  assert_equals(numGot, numExpected, `Got ${numGot} fonts, expected ${numExpected}.`);
+
+  return output;
+}
+
+function assert_fonts_exist(availableFonts, expectedFonts) {
+  const postscriptNameSet = new Set();
+  const fullNameSet = new Set();
+  const familySet = new Set();
+
+  for (const f of expectedFonts) {
+    postscriptNameSet.add(f.postscriptName);
+    fullNameSet.add(f.fullName);
+    familySet.add(f.family);
+  }
+
+  for (const f of availableFonts) {
+    postscriptNameSet.delete(f.postscriptName);
+    fullNameSet.delete(f.fullName);
+    familySet.delete(f.family);
+  }
+
+  assert_equals(postscriptNameSet.size, 0,
+              `Missing Postscript names: ${setToString(postscriptNameSet)}.`);
+  assert_equals(fullNameSet.size, 0,
+              `Missing Full names: ${setToString(fullNameSet)}.`);
+  assert_equals(familySet.size, 0,
+              `Missing Families: ${setToString(familySet)}.`);
+}
+
+function assert_font_has_tables(name, tables, expectedTables) {
+  for (const t of expectedTables) {
+    assert_equals(t.length, 4,
+                "Table names are always 4 characters long.");
+    assert_true(tables.has(t),
+                `Font ${name} did not have required table ${t}.`);
+    assert_greater_than(tables.get(t).size, 0,
+                `Font ${name} has table ${t} of size 0.`);
+  }
+}
+
+function setToString(set) {
+  const items = Array.from(set);
+  return JSON.stringify(items);
+}
+
+async function parseFontData(fontBlob) {
+  const fontInfo = {
+    errors: [],
+    numTables: 0,
+  };
+  const versionTag = await getTag(fontBlob, 0);
+
+  fontInfo.version = sfntVersionInfo(versionTag);
+  if (fontInfo.version === 'UNKNOWN') {
+    fontInfo.errors.push(`versionTag: "${versionTag}"`);
+  }
+
+  const numTables = await getUint16(fontBlob, 4);
+  [fontInfo.tables, fontInfo.tableMeta] = await getTableData(fontBlob, numTables);
+
+  return fontInfo;
+}
+
+async function getTableData(fontBlob, numTables) {
+  const dataMap = new Map();
+  const metaMap = new Map();
+  let blobOffset = 12;
+
+  for (let i = 0; i < numTables; i++) {
+    const tag = await getTag(fontBlob, blobOffset);
+    const checksum = await getUint32(fontBlob, blobOffset + 4);
+    const offset = await getUint32(fontBlob, blobOffset + 8);
+    const size = await getUint32(fontBlob, blobOffset + 12);
+    const tableBlob = fontBlob.slice(offset, offset + size);
+    dataMap.set(tag, tableBlob);
+    metaMap.set(tag, {checksum, offset, size});
+    blobOffset += 16;
+  }
+
+  return [dataMap, metaMap];
+}
+
+function sfntVersionInfo(version) {
+  // Spec: https://docs.microsoft.com/en-us/typography/opentype/spec/otff#organization-of-an-opentype-font
+  switch (version) {
+  case '\x00\x01\x00\x00':
+  case 'true':
+  case 'typ1':
+    return 'truetype';
+  case 'OTTO':
+    return 'cff';
+  default:
+    return 'UNKNOWN';
+  }
+}
+
+async function getTag(blob, offset) {
+  return (new TextDecoder).decode(
+    await blob.slice(offset, offset + 4).arrayBuffer());
+}
+
+async function getUint16(blob, offset) {
+  const slice = blob.slice(offset, offset + 2);
+  const buf = await slice.arrayBuffer();
+  const dataView = new DataView(buf);
+  return dataView.getUint16(0);
+}
+
+async function getUint32(blob, offset) {
+  const slice = blob.slice(offset, offset + 4);
+  const buf = await slice.arrayBuffer();
+  const dataView = new DataView(buf);
+  return dataView.getUint32(0);
+}
+
+function promiseDocumentReady() {
+  return new Promise(resolve => {
+    if (document.readyState === 'complete') {
+      resolve();
+    }
+    window.addEventListener('load', () => {
+      resolve();
+    }, {once: true});
+  });
+}
+
+function isPlatformSupported() {
+  if (navigator.platform.indexOf('Mac') != -1 ||
+      navigator.platform.indexOf('Win') != -1 ||
+      navigator.platform.indexOf('Linux') != -1) {
+    return true;
+  }
+  return false;
+}
+
+async function simulateUserActivation() {
+  await promiseDocumentReady();
+  return new Promise(resolve => {
+    const button = document.createElement('button');
+    button.textContent = 'Click to enumerate fonts';
+    button.style.fontSize = '40px';
+    button.onclick = () => {
+      document.body.removeChild(button);
+      resolve();
+    };
+    document.body.appendChild(button);
+    test_driver.click(button);
+  });
+}
+
+function font_access_test(test_function, name, properties) {
+  return promise_test(async (t) => {
+    await test_driver.set_permission({name: 'font-access'}, 'granted');
+    await simulateUserActivation();
+    await test_function(t, name, properties);
+  });
+}
diff --git a/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js b/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js
new file mode 100644
index 00000000000..0d6db539911
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/resources/window-tests-blob.js
@@ -0,0 +1,38 @@
+'use strict';
+
+font_access_test(async t => {
+  const iterator = navigator.fonts.query();
+
+  if (!isPlatformSupported()) {
+    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
+      for await (const f of iterator) {
+      }
+    })());
+    return;
+  }
+
+  const expectedFonts = await filterEnumeration(iterator,
+                                                getEnumerationTestSet({
+                                                  labelFilter: [TEST_SIZE_CATEGORY.small]}));
+  const additionalExpectedTables = getMoreExpectedTables(expectedFonts);
+
+  for (const f of expectedFonts) {
+    const data = await f.blob();
+    assert_not_equals(data.size, 0, 'Returned Blob size slot is populated.');
+    const buf = await data.arrayBuffer();
+    assert_not_equals(buf.length, 0, 'Returned ArrayBuffer is not empty.');
+    assert_equals(data.type, 'application/octet-stream', 'Returned Blob is of type octet-stream.');
+
+    const parsedData = await parseFontData(data);
+    assert_not_equals(parsedData.version, 'UNKNOWN', 'SFNT version is a known type.');
+
+    assert_not_equals(parsedData.tables.size, 0, "Should not have tables of size zero.");
+    assert_font_has_tables(f.postscriptName, parsedData.tables, BASE_TABLES);
+
+    if (f.postscriptName in additionalExpectedTables) {
+      assert_font_has_tables(f.postscriptName,
+                             parsedData.tables,
+                             additionalExpectedTables[f.postscriptName]);
+    }
+  }
+}, 'blob(): fonts have expected tables that are not empty');
diff --git a/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js b/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
new file mode 100644
index 00000000000..477d973a3a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/resources/window-tests-enumeration.js
@@ -0,0 +1,33 @@
+'use strict';
+
+promise_test(async t => {
+  const iterator = navigator.fonts.query();
+
+  await promise_rejects_dom(t, 'NotAllowedError', (async () => {
+                              for await (const f of iterator) {
+                              }
+                            })());
+}, 'iteration fails if there is no user activation');
+
+font_access_test(async t => {
+  const iterator = navigator.fonts.query();
+
+  if (!isPlatformSupported()) {
+    await promise_rejects_dom(t, 'NotSupportedError', (async () => {
+      for await (const f of iterator) {
+      }
+    })());
+    return;
+  }
+
+  assert_equals(typeof iterator, 'object', 'query() should return an Object');
+  assert_true(!!iterator[Symbol.asyncIterator],
+              'query() has an asyncIterator method');
+
+  const availableFonts = [];
+  for await (const f of iterator) {
+    availableFonts.push(f);
+  }
+
+  assert_fonts_exist(availableFonts, getEnumerationTestSet());
+}, 'query(): standard fonts returned');
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html
new file mode 100644
index 00000000000..29486d51ce0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that backplates are not painted behind hidden elements.
+</title>
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+  }
+</style>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html
new file mode 100644
index 00000000000..b81b52282e9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-11.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that backplates are not painted behind hidden elements.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-11-ref.html">
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+  }
+</style>
+
+<div style="visibility: hidden;">
+  No blackplate should be painted in forced colors mode.
+</div>
+<div style="visibility: collapse;">
+  No blackplate should be painted in forced colors mode.
+</div>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html
index ebe42e4e750..e7bb021217c 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html
@@ -6,10 +6,12 @@
 <script src="/resources/testharnessreport.js"></script>
 <style>
   #a {
+    background-color: purple;
     color: orange;
     forced-color-adjust: auto;
   }
   #b {
+    background-color: purple;
     color: orange;
     forced-color-adjust: none;
   }
@@ -36,7 +38,7 @@
 
     assert_equals(getComputedStyle(a).backgroundColor, "rgb(255, 255, 0)");
 
-    assert_equals(getComputedStyle(b).backgroundColor, "rgb(255, 255, 0)");
+    assert_equals(getComputedStyle(b).backgroundColor, "rgb(128, 0, 128)");
 
   }, "Checks that default highlighted text style does not get overridden in forced colors mode.");
 </script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html
index 6d6a3e1cc3f..479ead11aa7 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html
@@ -6,10 +6,10 @@
     forced-color-adjust: none;
     outline-color: CanvasText;
     outline-style: solid;
-    -webkit-column-count: 3;
-    -webkit-column-gap: 40px;
-    -webkit-column-rule-color: CanvasText;
-    -webkit-column-rule-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-color: CanvasText;
+    column-rule-style: solid;
   }
 </style>
 <body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html
index 8c87576bee2..a8819743fe9 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html
@@ -7,10 +7,10 @@
   h1 {
     outline-color: rgb(0, 0, 255);
     outline-style: solid;
-    -webkit-column-count: 3;
-    -webkit-column-gap: 40px;
-    -webkit-column-rule-color: rgb(0, 0, 255);
-    -webkit-column-rule-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-color: rgb(0, 0, 255);
+    column-rule-style: solid;
   }
 </style>
 <body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html
index 5a5d7f980f4..125c4364129 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html
@@ -6,6 +6,7 @@
     forced-color-adjust: none;
     text-decoration: underline;
     text-decoration-color: CanvasText;
+    text-emphasis: '*' CanvasText;
     -webkit-text-emphasis: '*' CanvasText;
   }
 </style>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html
index fbdc9da0b42..97dd3693855 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html
@@ -7,6 +7,7 @@
   p {
     text-decoration: underline;
     text-decoration-color: red;
+    text-emphasis: '*' blue;
     -webkit-text-emphasis: '*' blue;
   }
 </style>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28.html
index 4e00c65357f..7e2dfefadc4 100644
--- a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28.html
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-28.html
@@ -5,20 +5,23 @@
 <link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
 <link rel=match href="forced-colors-mode-28-ref.html">
 <style>
+  :root {
+    --url-image: url("resources/test-image.jpg");
+  }
   div {
     height: 20px;
     width: 10px;
   }
   #div1 {
-    background-image: url("resources/test-image.jpg");
+    background-image: var(--url-image);
     background-image: linear-gradient(red, yellow);
   }
   #div2 {
     background-image: linear-gradient(red, yellow);
-    background-image: url("resources/test-image.jpg");
+    background-image: var(--url-image);
   }
   #div3 {
-    background-image: url("resources/test-image.jpg");
+    background-image: var(--url-image);
   }
   #div4 {
     background-image: linear-gradient(red, yellow);
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29-ref.html
new file mode 100644
index 00000000000..825f63ae85b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode on table styles with sys colors</title>
+<style>
+  table {
+    border-collapse: collapse;
+    forced-color-adjust: none;
+  }
+  td, th {
+    border: 1px solid LinkText;
+    padding: 8px;
+    text-align: left;
+  }
+  tr:nth-child(even) {
+    background-color: CanvasText;
+  }
+  tr:nth-child(odd) {
+    color: Canvas;
+    text-decoration: underline;
+    text-decoration-color: LinkText;
+    text-emphasis: '*' LinkText;
+    -webkit-text-emphasis: '*' LinkText;
+  }
+</style>
+<table>
+  <tr>
+    <th>Column</th>
+    <th>Column</th>
+    <th>Column</th>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Entry</td>
+    <td>Entry</td>
+    <td>Entry</td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29.html
new file mode 100644
index 00000000000..794cca771f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-29.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode on table styles with sys colors</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-29-ref.html">
+<style>
+  table {
+    border-collapse: collapse;
+  }
+  td, th {
+    border: 1px solid LinkText;
+    padding: 8px;
+    text-align: left;
+  }
+  tr:nth-child(even) {
+    background-color: CanvasText;
+  }
+  tr:nth-child(odd) {
+    color: Canvas;
+    text-decoration: underline;
+    text-decoration-color: LinkText;
+    text-emphasis: '*' LinkText;
+    -webkit-text-emphasis: '*' LinkText;
+  }
+</style>
+<table>
+  <tr>
+    <th>Column</th>
+    <th>Column</th>
+    <th>Column</th>
+  </tr>
+  <tr>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Entry</td>
+    <td>Entry</td>
+    <td>Entry</td>
+  </tr>
+</table>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30-ref.html
new file mode 100644
index 00000000000..6029573933b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill/stroke with sys colors.
+</title>
+<style>
+  div {
+    fill: LinkText;
+    forced-color-adjust: none;
+    stroke: Link;
+  }
+</style>
+<div>
+  The triangle below should preserve the LinkText and Link fill/stroke colors
+  in forced colors mode.
+  <svg height="600" width="600">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</div>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30.html
new file mode 100644
index 00000000000..2f2a5e2e127
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-30.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill/stroke with sys colors.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-30-ref.html">
+<style>
+  div {
+    fill: LinkText;
+    stroke: Link;
+  }
+</style>
+<div>
+  The triangle below should preserve the LinkText and Link fill/stroke colors
+  in forced colors mode.
+  <svg height="600" width="600">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</div>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31-ref.html
new file mode 100644
index 00000000000..93d4045978f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color with sys colors.</title>
+<style>
+  h1 {
+    forced-color-adjust: none;
+    outline-color: LinkText;
+    outline-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-color: LinkText;
+    column-rule-style: solid;
+  }
+</style>
+<h1>
+  The outline-color and column-rule-color should be LinkText when forced colors
+  mode is enabled.
+</h1>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31.html
new file mode 100644
index 00000000000..ba338c1e0cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-31.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color with sys colors.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-31-ref.html">
+<style>
+  :root {
+    --hc-color: LinkText;
+  }
+  h1 {
+    outline-color: var(--hc-color);
+    outline-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-color: var(--hc-color);
+    column-rule-style: solid;
+  }
+</style>
+<h1>
+  The outline-color and column-rule-color should be LinkText when forced colors
+  mode is enabled.
+</h1>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html
new file mode 100644
index 00000000000..bd3595bf3bf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-32.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - webkit-tap-highlight-color with sys color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  a {
+    -webkit-tap-highlight-color: GrayText;
+  }
+</style>
+<a href="https://www.wikipedia.org" id="link">
+  This link color should not be overridden when forced colors mode is enabled.
+</a>
+<a href="" id="ref" style="forced-color-adjust:none"></a>
+
+<script>
+  var gray_text = getComputedStyle(ref).webkitTapHighlightColor;
+  test(function(){
+    assert_equals(getComputedStyle(link).webkitTapHighlightColor, gray_text);
+  }, "Checks hyperlinks are not overridden if a sys color is used.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33-ref.html
new file mode 100644
index 00000000000..ae7148ba8ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode :visited colors</title>
+<style>
+  a {
+    background-color: Canvas;
+    border: 1px solid VisitedText;
+    color: VisitedText;
+    forced-color-adjust: none;
+    text-decoration: line-through;
+    text-decoration-color: VisitedText;
+    text-emphasis: '*' VisitedText;
+    -webkit-text-emphasis: '*' VisitedText;
+  }
+</style>
+<a href="">Visited link.</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33.html
new file mode 100644
index 00000000000..17299efa2b9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-33.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode :visited colors</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-33-ref.html">
+<style>
+  a {
+    background-color: white;
+    border: 1px solid;
+    text-decoration: line-through;
+    text-emphasis: '*';
+    -webkit-text-emphasis: '*';
+  }
+  a:visited {
+    background-color: orange;
+    border: yellow;
+    color: red;
+    text-decoration-color: purple;
+    text-emphasis: blue;
+    -webkit-text-emphasis: blue;
+  }
+</style>
+<a href="">Visited link.</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34-ref.html
new file mode 100644
index 00000000000..b317d2f440c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode :visited colors with sys colors</title>
+<style>
+  a {
+    background-color: CanvasText;
+    border: 1px solid GrayText;
+    color: GrayText;
+    forced-color-adjust: none;
+    text-decoration: line-through;
+    text-decoration-color: GrayText;
+    text-emphasis: '*' GrayText;
+    -webkit-text-emphasis: '*' GrayText;
+  }
+</style>
+<a href="">Visited link.</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34.html
new file mode 100644
index 00000000000..f4ec066e30f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-34.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode :visited colors with sys colors</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-34-ref.html">
+<style>
+  a {
+    background-color: white;
+    border: 1px solid;
+    text-decoration: line-through;
+    text-emphasis: '*';
+    -webkit-text-emphasis: '*';
+  }
+  a:visited {
+    background-color: CanvasText;
+    border: GrayText;
+    color: GrayText;
+    text-decoration-color: GrayText;
+    text-emphasis: GrayText;
+    -webkit-text-emphasis: GrayText;
+  }
+</style>
+<a href="">Visited link.</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35-ref.html
new file mode 100644
index 00000000000..ba38e484b55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited fill/stroke.
+</title>
+<style>
+  a {
+    fill: VisitedText;
+    forced-color-adjust: none;
+  }
+</style>
+<a href="">
+  The triangle below should not preserve the blue/green fill/stroke colors
+  in forced colors mode.
+  <svg height="600" width="600">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</a>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35.html
new file mode 100644
index 00000000000..098a9ce9d33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-35.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited fill/stroke.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-35-ref.html">
+<style>
+  a {
+    fill: CurrentColor;
+    stroke: CurrentColor;
+  }
+  a:visited {
+    fill: blue;
+    stroke: green;
+  }
+</style>
+<a href="">
+  The triangle below should not preserve the blue/green fill/stroke colors
+  in forced colors mode.
+  <svg height="600" width="600">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36-ref.html
new file mode 100644
index 00000000000..838b10da953
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited fill/stroke with sys colors.
+</title>
+<style>
+  a {
+    fill: CanvasText;
+    forced-color-adjust: none;
+    stroke: LinkText;
+  }
+</style>
+<a href="">
+  The triangle below should preserve the CanvasText/LinkText fill/stroke colors
+  in forced colors mode.
+  <svg height="600" width="600">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</a>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36.html
new file mode 100644
index 00000000000..0fd90810dce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-36.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited fill/stroke with sys colors.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-36-ref.html">
+<style>
+  a {
+    fill: Canvas;
+    stroke: Canvas;
+  }
+  a:visited {
+    fill: CanvasText;
+    stroke: LinkText;
+  }
+</style>
+<a href="">
+  The triangle below should preserve the CanvasText/LinkText fill/stroke colors
+  in forced colors mode.
+  <svg height="600" width="600">
+    <path d="M150 0 L75 200 L225 200 Z" />
+  </svg>
+</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37-ref.html
new file mode 100644
index 00000000000..a2cc4b7efee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited outline and column color.</title>
+<style>
+  a {
+    forced-color-adjust: none;
+    outline-color: VisitedText;
+    outline-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-color: VisitedText;
+    column-rule-style: solid;
+  }
+</style>
+<a href="">
+  The outline-color and column-rule-color should be overridden when forced colors
+  mode is enabled.
+</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37.html
new file mode 100644
index 00000000000..80e06ed8703
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-37.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited outline and column color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-37-ref.html">
+<style>
+  :root {
+    --hc-color: red;
+  }
+  a {
+    outline-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-style: solid;
+  }
+  a:visited {
+    outline-color: var(--hc-color);
+    column-rule-color: var(--hc-color);
+  }
+</style>
+<a href="">
+  The outline-color and column-rule-color should be overridden when forced colors
+  mode is enabled.
+</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38-ref.html
new file mode 100644
index 00000000000..e72a73fcef7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited outline and column color with sys colors.</title>
+<style>
+  a {
+    forced-color-adjust: none;
+    outline-color: GrayText;
+    outline-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-color: GrayText;
+    column-rule-style: solid;
+  }
+</style>
+<a href="">
+  The outline-color and column-rule-color should be GrayText when forced colors
+  mode is enabled.
+</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38.html
new file mode 100644
index 00000000000..3179aaf4b99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-38.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - :visited outline and column color with sys colors.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-38-ref.html">
+<style>
+  :root {
+    --hc-color: GrayText;
+  }
+  a {
+    outline-style: solid;
+    column-count: 3;
+    column-gap: 40px;
+    column-rule-style: solid;
+  }
+  a:visited {
+    outline-color: var(--hc-color);
+    column-rule-color: var(--hc-color);
+  }
+</style>
+<a href="">
+  The outline-color and column-rule-color should be GrayText when forced colors
+  mode is enabled.
+</a>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39-ref.html
new file mode 100644
index 00000000000..df6de6eda25
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - pseudo elements.</title>
+<style>
+  p::before {
+    background: Canvas;
+    content: 'before';
+    display: block;
+    forced-color-adjust: none;
+    width: 100%;
+  }
+</style>
+<p>
+  The background color of pseudo elements should get overridden in Forced Colors
+  Mode.
+</p>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39.html
new file mode 100644
index 00000000000..7b69fc979c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-39.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - pseudo elements.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-39-ref.html">
+<style>
+  p::before {
+    background: blue;
+    content: 'before';
+    display: block;
+    width: 100%;
+  }
+</style>
+<p>
+  The background color of pseudo elements should get overridden in Forced Colors
+  Mode.
+</p>
diff --git a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled.html b/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled.html
index 8c7057b430c..40430d7bbfb 100644
--- a/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled.html
+++ b/tests/wpt/web-platform-tests/fullscreen/api/document-fullscreen-enabled.html
@@ -4,14 +4,14 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <iframe></iframe>
-<iframe allowfullscreen></iframe>
 <script>
 test(function()
 {
     assert_true(document.fullscreenEnabled, "top-level document");
-
-    var iframes = document.getElementsByTagName("iframe");
-    assert_false(iframes[0].contentDocument.fullscreenEnabled, "iframe without allowfullscreen");
-    assert_true(iframes[1].contentDocument.fullscreenEnabled, "iframe with allowfullscreen");
+    const iframe = document.querySelector("iframe");
+    assert_true(iframe.contentDocument.fullscreenEnabled, "same-origin iframe");
 });
+
+// The cross-origin iframe case is tested in
+// /html/semantics/embedded-content/the-iframe-element/iframe-allowfullscreen.html
 </script>
diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
index 20436be8007..da1af413248 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
@@ -28,12 +28,12 @@ function run_fp_tests_disabled(sensorName) {
   const desc = "'new " + sensorName + "()'";
 
   test(() => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     assert_throws_dom("SecurityError", () => {new sensorType()});
   }, `${sensorName}: ${header} disallows the top-level document.`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -43,7 +43,7 @@ function run_fp_tests_disabled(sensorName) {
   }, `${sensorName}: ${header} disallows same-origin iframes.`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -59,11 +59,11 @@ function run_fp_tests_enabled(sensorName) {
   const desc = "'new " + sensorName + "()'";
 
   test(() => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
   }, `${sensorName}: ${header} allows the top-level document.`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -73,7 +73,7 @@ function run_fp_tests_enabled(sensorName) {
   }, `${sensorName}: ${header} allows same-origin iframes.`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -89,7 +89,7 @@ function run_fp_tests_enabled_by_attribute(sensorName) {
   const desc = "'new " + sensorName + "()'";
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -100,7 +100,7 @@ function run_fp_tests_enabled_by_attribute(sensorName) {
   }, `${sensorName}: ${header} allows same-origin iframe`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -117,7 +117,7 @@ function run_fp_tests_enabled_by_attribute_redirect_on_load(sensorName) {
   const desc = "'new " + sensorName + "()'";
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -128,7 +128,7 @@ function run_fp_tests_enabled_by_attribute_redirect_on_load(sensorName) {
   }, `${sensorName}: ${header} allows same-origin relocation`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -145,11 +145,11 @@ function run_fp_tests_enabled_on_self_origin(sensorName) {
   const desc = "'new " + sensorName + "()'";
 
   test(() => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
   }, `${sensorName}: ${header} allows the top-level document.`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
@@ -159,7 +159,7 @@ function run_fp_tests_enabled_on_self_origin(sensorName) {
   }, `${sensorName}: ${header} allows same-origin iframes.`);
 
   async_test(t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     test_feature_availability(
       desc,
       t,
diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-iframe-tests.sub.js b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-iframe-tests.sub.js
index 200013c48f9..3ebabad3a10 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-iframe-tests.sub.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-iframe-tests.sub.js
@@ -24,7 +24,7 @@ function run_generic_sensor_iframe_tests(sensorName) {
   const featurePolicies = get_feature_policies_for_sensor(sensorName);
 
   sensor_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const iframe = document.createElement('iframe');
     iframe.allow = featurePolicies.join(';') + ';';
     iframe.src = 'https://{{domains[www1]}}:{{ports[https][0]}}/generic-sensor/resources/iframe_sensor_handler.html';
@@ -67,7 +67,7 @@ function run_generic_sensor_iframe_tests(sensorName) {
  to cross-origin frame`);
 
   sensor_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const iframe = document.createElement('iframe');
     iframe.allow = featurePolicies.join(';') + ';';
     iframe.src = 'https://{{host}}:{{ports[https][0]}}/generic-sensor/resources/iframe_sensor_handler.html';
@@ -131,7 +131,7 @@ function run_generic_sensor_iframe_tests(sensorName) {
  to same-origin frame`);
 
   sensor_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const iframe = document.createElement('iframe');
     iframe.allow = featurePolicies.join(';') + ';';
     iframe.src = 'https://{{host}}:{{ports[https][0]}}/generic-sensor/resources/iframe_sensor_handler.html';
diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
index 833bd0e7313..26ff6919599 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
@@ -51,7 +51,7 @@ function runGenericSensorTests(sensorName,
   }
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     sensorProvider.setGetSensorShouldFail(sensorName, true);
     const sensor = new sensorType;
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
@@ -64,7 +64,7 @@ function runGenericSensorTests(sensorName,
   }, `${sensorName}: Test that onerror is sent when sensor is not supported.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     sensorProvider.setPermissionsDenied(sensorName, true);
     const sensor = new sensorType;
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
@@ -78,7 +78,7 @@ function runGenericSensorTests(sensorName,
  granted.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType({frequency: 560});
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -93,7 +93,7 @@ function runGenericSensorTests(sensorName,
   }, `${sensorName}: Test that onerror is send when start() call has failed.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType({frequency: 560});
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     sensor.start();
@@ -108,7 +108,7 @@ function runGenericSensorTests(sensorName,
   }, `${sensorName}: Test that frequency is capped to allowed maximum.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const maxSupportedFrequency = 5;
     sensorProvider.setMaximumSupportedFrequency(maxSupportedFrequency);
     const sensor = new sensorType({frequency: 50});
@@ -126,7 +126,7 @@ function runGenericSensorTests(sensorName,
  frequency.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const minSupportedFrequency = 2;
     sensorProvider.setMinimumSupportedFrequency(minSupportedFrequency);
     const sensor = new sensorType({frequency: -1});
@@ -144,7 +144,7 @@ function runGenericSensorTests(sensorName,
  frequency.`);
 
   promise_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const iframe = document.createElement('iframe');
     iframe.allow = featurePolicies.join(' \'none\'; ') + ' \'none\';';
     iframe.srcdoc = '<script>' +
@@ -171,7 +171,7 @@ function runGenericSensorTests(sensorName,
  disallowed to use feature policy.`);
 
   promise_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const iframe = document.createElement('iframe');
     iframe.allow = featurePolicies.join(';') + ';';
     iframe.srcdoc = '<script>' +
@@ -198,7 +198,7 @@ function runGenericSensorTests(sensorName,
  allowed to use feature policy.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -219,7 +219,7 @@ function runGenericSensorTests(sensorName,
  valid.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor1 = new sensorType();
     const sensorWatcher1 = new EventWatcher(t, sensor1, ["reading", "error"]);
     sensor1.start();
@@ -249,7 +249,7 @@ function runGenericSensorTests(sensorName,
   }, `${sensorName}: sensor reading is correct.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -268,7 +268,7 @@ function runGenericSensorTests(sensorName,
   }, `${sensorName}: sensor timestamp is updated when time passes.`);
 
   sensor_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     assert_false(sensor.activated);
@@ -284,18 +284,7 @@ function runGenericSensorTests(sensorName,
  states are correct.`);
 
   sensor_test(async t => {
-    assert_true(sensorName in self);
-    const sensor = new sensorType();
-    const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
-    const start_return = sensor.start();
-
-    await sensorWatcher.wait_for("activate");
-    assert_equals(start_return, undefined);
-    sensor.stop();
-  }, `${sensorName}: sensor.start() returns undefined.`);
-
-  sensor_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     sensor.start();
@@ -308,18 +297,7 @@ function runGenericSensorTests(sensorName,
  started sensor.`);
 
   sensor_test(async t => {
-    assert_true(sensorName in self);
-    const sensor = new sensorType();
-    const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
-    sensor.start();
-
-    await sensorWatcher.wait_for("activate");
-    const stop_return = sensor.stop();
-    assert_equals(stop_return, undefined);
-  }, `${sensorName}: sensor.stop() returns undefined.`);
-
-  sensor_test(async t => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     sensor.start();
@@ -332,7 +310,7 @@ function runGenericSensorTests(sensorName,
  stopped sensor.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -367,7 +345,7 @@ function runGenericSensorTests(sensorName,
 
 //  TBD file a WPT issue: visibilityChangeWatcher times out.
 //  sensor_test(async (t, sensorProvider) => {
-//    assert_true(sensorName in self);
+//    assert_implements(sensorName in self, `${sensorName} is not supported.`);
 //    const sensor = new sensorType();
 //    const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
 //    const visibilityChangeWatcher = new EventWatcher(t, document,
@@ -392,48 +370,41 @@ function runGenericSensorTests(sensorName,
 //  }, `${sensorName}: sensor readings can not be fired on the background tab.`);
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
-    const fastSensor = new sensorType({frequency: 60});
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
+
+    const fastSensor = new sensorType({ frequency: 60 });
+    t.add_cleanup(() => { fastSensor.stop(); });
+    let eventWatcher = new EventWatcher(t, fastSensor, "activate");
     fastSensor.start();
 
+    // Wait for |fastSensor| to be activated so that the call to
+    // getSamplingFrequency() below works.
+    await eventWatcher.wait_for("activate");
+
     const mockSensor = await sensorProvider.getCreatedSensor(sensorName);
     await mockSensor.setSensorReading(readings);
 
-    return new Promise((resolve, reject) => {
-      let fastSensorNotifiedCounter = 0;
-      let slowSensorNotifiedCounter = 0;
+    // We need |fastSensorFrequency| because 60Hz might be higher than a sensor
+    // type's maximum allowed frequency.
+    const fastSensorFrequency = mockSensor.getSamplingFrequency();
+    const slowSensorFrequency = fastSensorFrequency * 0.25;
 
-      fastSensor.onreading = () => {
-        if (fastSensorNotifiedCounter === 0) {
-          // For Magnetometer and ALS, the maximum frequency is less than 60Hz
-          // we make "slow" sensor 4 times slower than the actual applied
-          // frequency, so that the "fast" sensor will immediately overtake it
-          // despite the notification adjustments.
-          const slowFrequency = mockSensor.getSamplingFrequency() * 0.25;
-          const slowSensor = new sensorType({frequency: slowFrequency});
-          slowSensor.onreading = () => {
-            // Skip the initial notification that always comes immediately.
-            if (slowSensorNotifiedCounter === 2) {
-              fastSensor.stop();
-              slowSensor.stop();
+    const slowSensor = new sensorType({ frequency: slowSensorFrequency });
+    t.add_cleanup(() => { slowSensor.stop(); });
+    eventWatcher = new EventWatcher(t, slowSensor, "activate");
+    slowSensor.start();
 
-              try {
-                assert_greater_than(fastSensorNotifiedCounter, 3,
-                    "Fast sensor overtakes the slow one");
-                resolve();
-              } catch (e) {
-                reject(e);
-              }
-            }
-            slowSensorNotifiedCounter++;
-          }
-          slowSensor.onerror = reject;
-          slowSensor.start();
-        }
-        fastSensorNotifiedCounter++;
-      }
-      fastSensor.onerror = reject;
-    });
+    // Wait for |slowSensor| to be activated before we check if the mock
+    // platform sensor's sampling frequency has changed.
+    await eventWatcher.wait_for("activate");
+    assert_equals(mockSensor.getSamplingFrequency(), fastSensorFrequency);
+
+    // Now stop |fastSensor| and verify that the sampling frequency has dropped
+    // to the one |slowSensor| had requested.
+    fastSensor.stop();
+    return t.step_wait(() => {
+      return mockSensor.getSamplingFrequency() === slowSensorFrequency;
+    }, "Sampling frequency has dropped to slowSensor's requested frequency");
   }, `${sensorName}: frequency hint works.`);
 
 //  Re-enable after https://github.com/w3c/sensors/issues/361 is fixed.
@@ -450,7 +421,7 @@ function runGenericSensorTests(sensorName,
 // option.`);
 
   test(() => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const invalidFreqs = [
       "invalid",
       NaN,
@@ -471,7 +442,7 @@ function runGenericSensorTests(sensorName,
   }
 
   sensor_test(async (t, sensorProvider) => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const sensor1 = new sensorType({frequency: 60});
     const sensor2 = new sensorType({frequency: 60, referenceFrame: "screen"});
     const sensorWatcher1 = new EventWatcher(t, sensor1, ["reading", "error"]);
@@ -503,7 +474,7 @@ function runGenericSensorTests(sensorName,
  is 'screen'.`);
 
   test(() => {
-    assert_true(sensorName in self);
+    assert_implements(sensorName in self, `${sensorName} is not supported.`);
     const invalidRefFrames = [
       "invalid",
       null,
diff --git a/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js b/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js
index c2afb400207..40f2c906f65 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/resources/generic-sensor-helpers.js
@@ -8,44 +8,36 @@
 // these tests the browser must be run with these options:
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
-const loadChromiumResources = async () => {
-  if (!('MojoInterfaceInterceptor' in self)) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
-
-  const resources = [
-    '/gen/layout_test_data/mojo/public/js/mojo_bindings.js',
+async function loadChromiumResources() {
+  const chromiumResources = [
     '/gen/mojo/public/mojom/base/string16.mojom.js',
     '/gen/services/device/public/mojom/sensor.mojom.js',
     '/gen/services/device/public/mojom/sensor_provider.mojom.js',
-    '/resources/testdriver.js',
-    '/resources/testdriver-vendor.js',
-    '/resources/chromium/generic_sensor_mocks.js',
   ];
-
-  await Promise.all(resources.map(path => {
-    const script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    const promise = new Promise((resolve, reject) => {
-      script.onload = resolve;
-      script.onerror = reject;
-    });
-    document.head.appendChild(script);
-    return promise;
-  }));
-};
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/testdriver.js');
+  await loadScript('/resources/testdriver-vendor.js');
+  await loadScript('/resources/chromium/generic_sensor_mocks.js');
+}
 
 async function initialize_generic_sensor_tests() {
   if (typeof GenericSensorTest === 'undefined') {
-    await loadChromiumResources();
+    const script = document.createElement('script');
+    script.src = '/resources/test-only-api.js';
+    script.async = false;
+    const p = new Promise((resolve, reject) => {
+      script.onload = () => { resolve(); };
+      script.onerror = e => { reject(e); };
+    })
+    document.head.appendChild(script);
+    await p;
+
+    if (isChromiumBased) {
+      await loadChromiumResources();
+    }
   }
-  assert_true(
-    typeof GenericSensorTest !== 'undefined',
-    'Mojo testing interface is not available.'
-  );
+  assert_implements(GenericSensorTest, 'GenericSensorTest is unavailable.');
+
   let sensorTest = new GenericSensorTest();
   await sensorTest.initialize();
   return sensorTest;
diff --git a/tests/wpt/web-platform-tests/html/README.md b/tests/wpt/web-platform-tests/html/README.md
index a85911a8a09..11e5bcf81c4 100644
--- a/tests/wpt/web-platform-tests/html/README.md
+++ b/tests/wpt/web-platform-tests/html/README.md
@@ -17,3 +17,4 @@ For historical reasons, parts of HTML have their own directories:
 * [/websockets](/websockets)
 * [/webstorage](/webstorage)
 * [/workers](/workers)
+* [/x-frame-options](/x-frame-options)
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/010.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/010.html
index f1749decc69..585cddc48e5 100644
--- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/010.html
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/010.html
@@ -8,7 +8,7 @@
 <a target="test" onclick="document.forms[0].submit()" href="href.html">Test</a>
 <script>
 var t = async_test();
-t.step(function() {document.getElementsByTagName("a")[0].click()});
+onload = t.step_func(function() {document.getElementsByTagName("a")[0].click()});
 onmessage = t.step_func(
   function(e) {
     assert_equals(e.data, "href");
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html
new file mode 100644
index 00000000000..5d7aa2b9cbb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/failure-check-sequence.https.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Sequence of the checks performed against a navigation response</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+'use strict';
+const collect = (win) => {
+  const report = new Promise((resolve) => {
+    if (!win.ReportingObserver) {
+      return;
+    }
+
+    const observer = new win.ReportingObserver(resolve);
+    observer.observe();
+  }).then((reports) => reports[0].type);
+  // Although CSP also makes use of ReportingObserver, monitoring this event
+  // allows the test to provide value to implementations that have not yet
+  // integrated CSP and Reporting (as of the time of this writing, Firefox and
+  // Safari).
+  const cspViolation = new Promise((resolve) => {
+    win.document.addEventListener('securitypolicyviolation', () => resolve('csp-violation'));
+  });
+  const halfASecond = new Promise((resolve) => setTimeout(() => resolve(null), 500));
+
+  return Promise.race([report, cspViolation, halfASecond]);
+};
+
+const createWindow = (t, url) => {
+  const win = open(url);
+  t.add_cleanup(() => win.close());
+  return new Promise((resolve) => win.onload = () => resolve(win));
+};
+
+promise_test(async (t) => {
+  const win = await createWindow(t, '/common/blank.html?pipe=header(content-security-policy, frame-src none)');
+  const iframe = win.document.createElement('iframe');
+  iframe.src = '/common/blank.html?pipe=header(x-frame-options, deny)';
+  win.document.body.appendChild(iframe);
+
+  assert_equals(await collect(win), 'csp-violation');
+}, 'CSP check precedes X-Frame-Options check');
+
+promise_test(async (t) => {
+  const win = await createWindow(t, '/common/blank.html?pipe=header(content-security-policy, frame-src none)|header(cross-origin-embedder-policy, require-corp)');
+  const iframe = win.document.createElement('iframe');
+  iframe.src = '/common/blank.html';
+  win.document.body.appendChild(iframe);
+
+  assert_equals(await collect(win), 'csp-violation');
+}, 'CSP check precedes COEP check - CSP header first');
+
+promise_test(async (t) => {
+  const win = await createWindow(t, '/common/blank.html?pipe=header(cross-origin-embedder-policy, require-corp)|header(content-security-policy, frame-src none)');
+  const iframe = win.document.createElement('iframe');
+  iframe.src = '/common/blank.html';
+  win.document.body.appendChild(iframe);
+
+  assert_equals(await collect(win), 'csp-violation');
+}, 'CSP check precedes COEP check - COEP header first');
+
+promise_test(async (t) => {
+  const win = await createWindow(t, '/common/blank.html?pipe=header(cross-origin-embedder-policy, require-corp)');
+  const iframe = win.document.createElement('iframe');
+  iframe.src = '/common/blank.html?pipe=header(x-frame-options, deny)';
+  win.document.body.appendChild(iframe);
+
+  assert_equals(await collect(win), 'coep');
+}, 'COEP check precedes X-Frame-Options check');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html b/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
index 1d4560601b7..3b7c7832d7e 100644
--- a/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html
@@ -656,7 +656,7 @@ addTest(function(win) {
   var desc = Object.getOwnPropertyDescriptor(window, "onmouseenter");
   var f = () => {};
 
-  // Check that it has [LenientThis] behavior
+  // Check that it has [LegacyLenientThis] behavior
   assert_equals(desc.get.call({}), undefined, "getter should return undefined");
   desc.set.call({}, f); // Should not throw.
 
@@ -669,14 +669,14 @@ addTest(function(win) {
   assert_equals(desc.get.call(B), null, "Should have been reset");
 
   // Check that applying it to a cross-origin window throws instead of doing
-  // the [LenientThis] behavior.
+  // the [LegacyLenientThis] behavior.
   assert_throws_dom("SecurityError", () => {
     desc.get.call(win);
   }, "Should throw when getting cross-origin");
   assert_throws_dom("SecurityError", () => {
     desc.set.call(win, f);
   }, "Should throw when setting cross-origin");
-}, "LenientThis behavior");
+}, "LegacyLenientThis behavior");
 
 // We do a fresh load of the subframes for each test to minimize side-effects.
 // It would be nice to reload ourselves as well, but we can't do that without
diff --git a/tests/wpt/web-platform-tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html b/tests/wpt/web-platform-tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html
index c3db82f8502..88032fa18d5 100644
--- a/tests/wpt/web-platform-tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html
+++ b/tests/wpt/web-platform-tests/html/browsers/the-window-object/proxy-getOwnPropertyDescriptor.html
@@ -52,7 +52,7 @@ test(() => {
     Object.getOwnPropertyDescriptor(window, 'document')
   );
   assert_equals(trapCalls, 1);
-}, 'Window target, forwarding trap, [Unforgeable] "document" attribute');
+}, 'Window target, forwarding trap, [LegacyUnforgeable] "document" attribute');
 
 test(() => {
   const trapResult = {get() {}, set(_val) {}, enumerable: false, configurable: true};
@@ -80,7 +80,7 @@ test(() => {
     Object.getOwnPropertyDescriptor(document, 'location')
   );
   assert_equals(trapCalls, 1);
-}, 'Document target, forwarding trap, [Unforgeable] "location" attribute');
+}, 'Document target, forwarding trap, [LegacyUnforgeable] "location" attribute');
 
 test(() => {
   const trapResult = {value: 4, writable: false, enumerable: true, configurable: true};
@@ -104,7 +104,7 @@ test(() => {
   assert_equals(location.hash, '#new');
   assert_true(descriptor.enumerable);
   assert_false(descriptor.configurable);
-}, 'Location target, no trap, [Unforgeable] "hash" attribute');
+}, 'Location target, no trap, [LegacyUnforgeable] "hash" attribute');
 
 test(() => {
   let trapCalls = 0;
@@ -120,7 +120,7 @@ test(() => {
     Object.getOwnPropertyDescriptor(location, 'reload')
   );
   assert_equals(trapCalls, 1);
-}, 'Location proxy target, forwarding trap, [Unforgeable] "reload" method');
+}, 'Location proxy target, forwarding trap, [LegacyUnforgeable] "reload" method');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print-ref.html b/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print-ref.html
new file mode 100644
index 00000000000..c36c459881c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print-ref.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<style>
+  body { margin: 0 }
+  p {
+    /* 2 times the default margin of <body>, to account for the doubly-nested document */
+    margin: 16px;
+  }
+</style>
+<p>PASS
diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print.html b/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print.html
new file mode 100644
index 00000000000..844f6ba3734
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/windows/iframe-nested-print.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<link rel=match href="iframe-nested-print-ref.html">
+<style>
+  body { margin: 0 }
+</style>
+<iframe frameborder=0 scrolling=no srcdoc="<iframe scrolling=no frameborder=0 srcdoc='PASS'></iframe>"></iframe>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
index fd9a5e96d1f..7483800b41e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createImageBitmap-e_srgb.html
@@ -44,8 +44,9 @@ function testPixels(ctx, tests, sourceType)
         tolerance = 0.03;
     for (var i = 0; i < tests.length; i++) {
         actual = ctx.getImageData(tests[i][0], tests[i][1], 1, 1).dataUnion;
+        assert_implements(actual, 'ImageData dataUnion not supported');
         expected = tests[i][2];
-        assert_true(actual.length === expected.length);
+        assert_equals(actual.length, expected.length);
         for (var j = 0; j < actual.length; j++)
            assert_approx_equals(actual[j], expected[j], tolerance, tests[i][3]);
     }
@@ -171,7 +172,9 @@ function compareBitmaps(bitmap1, bitmap2)
     ctx1.drawImage(bitmap1, 0, 0);
     ctx2.drawImage(bitmap2, 0, 0);
     var data1 = ctx1.getImageData(0, 0, 50, 50).dataUnion;
+    assert_implements(data1, 'ImageData dataUnion not supported');
     var data2 = ctx2.getImageData(0, 0, 50, 50).dataUnion;
+    assert_implements(data2, 'ImageData dataUnion not supported');
     var dataMatched = true;
     for (var i = 0; i < data1.length; i++) {
         if (data1[i] != data2[i]) {
@@ -286,14 +289,11 @@ function initializeTestCanvasTransparent(canvasColorSpace, canvasPixelFormat)
 // HTMLImageElement - Opaque sRGB
 // File formats: AVIF, Bitmap, GIF, ICO, JPEG, PNG, WEBP
 ['avif', 'bmp', 'gif', 'ico', 'jpg', 'png', 'webp'].forEach(ext => {
-    promise_test(function() {
-        return new Promise((resolve,reject) => {
-            var image = new Image();
-            image.onload = function() {
-                resolve(image);
-            }
-            image.src = 'resources/pattern-srgb.' + ext;
-        }).then(testImageBitmapOpaque);
+    promise_test(async () => {
+        const image = new Image();
+        image.src = 'resources/pattern-srgb.' + ext;
+        await image.decode();
+        await testImageBitmapOpaque(image);
     }, 'createImageBitmap in e-sRGB from an opaque sRGB HTMLImageElement (' + ext +
         ') with resize.');
 });
@@ -301,14 +301,11 @@ function initializeTestCanvasTransparent(canvasColorSpace, canvasPixelFormat)
 // HTMLImageElement - Transparent sRGB
 // File formats: AVIF, Bitmap, ICO, PNG, WEBP
 ['avif', 'bmp', 'ico', 'png', 'webp'].forEach(ext => {
-    promise_test(function() {
-        return new Promise((resolve,reject) => {
-            var image = new Image();
-            image.onload = function() {
-                resolve(image);
-            }
-            image.src = 'resources/pattern-srgb-transparent.' + ext;
-        }).then(testImageBitmapFromTransparentImage);
+    promise_test(async () => {
+        const image = new Image();
+        image.src = 'resources/pattern-srgb-transparent.' + ext;
+        await image.decode();
+        await testImageBitmapFromTransparentImage(image);
     }, 'createImageBitmap in e-sRGB from a transparent sRGB HTMLImageElement (' + ext +
         ') with resize.');
 });
@@ -316,56 +313,54 @@ function initializeTestCanvasTransparent(canvasColorSpace, canvasPixelFormat)
 ////////////////////////////////////////////////////////////////////////////////
 
 // SVG Image - sRGB
-promise_test(function() {
-    return new Promise((resolve, reject) => {
-        var image = new Image();
-        image.onload = function() {
-            resolve(image);
-        }
-        image.src = 'resources/pattern-srgb.svg'
-    }).then(testImageBitmapFromSVG);
+promise_test(async () => {
+    const image = new Image();
+    image.src = 'resources/pattern-srgb.svg'
+    await image.decode();
+    await testImageBitmapFromSVG(image);
 }, 'createImageBitmap in e-sRGB from a sRGB SVG image with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // HTMLVideoElement - sRGB
-promise_test(function() {
-    return new Promise((resolve, reject) => {
-        var video = document.createElement("video");
-        video.oncanplaythrough = function() {
-            resolve(video);
-        }
-        video.preload = "auto";
-        video.src = 'resources/pattern-srgb-fullcolor.ogv'
-    }).then(testImageBitmapVideoSource);
+promise_test(async () => {
+    var video = document.createElement("video");
+    assert_implements_optional(video.canPlayType("video/ogg"), "video/ogg not supported");
+    video.preload = "auto";
+    video.src = 'resources/pattern-srgb-fullcolor.ogv'
+    await new Promise((resolve, reject) => {
+        video.onloadeddata = resolve;
+        video.onerror = reject;
+    });
+    await testImageBitmapVideoSource(video);
 }, 'createImageBitmap in e-sRGB from a sRGB HTMLVideoElement with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // HTMLCanvasElement - Opaque sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvas('srgb', 'uint8');
-    return testImageBitmapOpaque(testCanvas);
+    await testImageBitmapOpaque(testCanvas);
 }, 'createImageBitmap in e-sRGB from an opaque sRGB HTMLCanvasElement with resize.');
 
 // HTMLCanvasElement - Opaque e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvas('srgb', 'float16');
-    return testImageBitmapOpaque(testCanvas);
+    await testImageBitmapOpaque(testCanvas);
 }, 'createImageBitmap in e-sRGB from an opaque e-sRGB HTMLCanvasElement with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // HTMLCanvasElement - Transparent sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvasTransparent('srgb', 'uint8');
-    return testImageBitmapTransparent(testCanvas);
+    await testImageBitmapTransparent(testCanvas);
 }, 'createImageBitmap in e-sRGB from a transparent sRGB HTMLCanvasElement with resize.');
 
 // HTMLCanvasElement - Transparent e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvasTransparent('srgb', 'float16');
-    return testImageBitmapTransparent(testCanvas);
+    await testImageBitmapTransparent(testCanvas);
 }, 'createImageBitmap in e-sRGB from a transparent e-sRGB HTMLCanvasElement with resize.');
 
 //////////////////////////////////////////////////////////////////////////////
@@ -373,60 +368,48 @@ promise_test(function() {
 // Blob from file - Opaque sRGB
 // File formats: AVIF, Bitmap, GIF, ICO, JPEG, PNG, WEBP
 ['avif', 'bmp', 'gif', 'ico', 'jpg', 'png', 'webp'].forEach(ext => {
-    promise_test(function() {
-        return new Promise((resolve, reject) => {
-            var xhr = new XMLHttpRequest();
-            xhr.open("GET", 'resources/pattern-srgb.' + ext);
-            xhr.responseType = 'blob';
-            xhr.send();
-            xhr.onload = function() {
-                resolve(xhr.response);
-            };
-        }).then(testImageBitmapOpaque);
+    promise_test(async () => {
+        const response = await fetch('resources/pattern-srgb.' + ext);
+        assert_true(response.ok);
+        const blob = await response.blob();
+        await testImageBitmapOpaque(blob);
     }, 'createImageBitmap in e-sRGB from an opaque sRGB Blob (' + ext + ') with resize.');
 });
 
 // Blob form file - Transparent sRGB
 // File formats: AVIF, Bitmap, ICO, PNG, WEBP
 ['avif', 'bmp', 'ico', 'png', 'webp'].forEach(ext => {
-    promise_test(function() {
-        return new Promise((resolve, reject) => {
-            var xhr = new XMLHttpRequest();
-            xhr.open("GET", 'resources/pattern-srgb-transparent.' + ext);
-            xhr.responseType = 'blob';
-            xhr.send();
-            xhr.onload = function() {
-                resolve(xhr.response);
-            };
-        }).then(testImageBitmapFromTransparentImage);
+    promise_test(async () => {
+        const response = await fetch('resources/pattern-srgb-transparent.' + ext);
+        assert_true(response.ok);
+        const blob = await response.blob();
+        await testImageBitmapFromTransparentImage(blob);
     }, 'createImageBitmap in e-sRGB from a transparent sRGB Blob (' + ext + ') with resize.');
 });
 
 // Color managed blob from canvas
 function testCreateImageBitmapFromColorManagedBlob(pixelFormat, isTransparent) {
-    let canvasPixelFormat = 'uint8';
-    if (pixelFormat == 'uint16')
-        canvasPixelFormat = 'float16';
-    var testCanvas;
-    if (isTransparent)
-      testCanvas = initializeTestCanvasTransparent('srgb', canvasPixelFormat);
-    else
-      testCanvas = initializeTestCanvas('srgb', canvasPixelFormat);
-    var encodeOptions = {};
-    encodeOptions.quality = 1;
-    encodeOptions.type = 'image/png';
-    encodeOptions.pixelFormat = pixelFormat;
-
-    var t = async_test('createImageBitmap in e-sRGB from color managed Blob' +
-        ' with resize. blobPixelFormat: ' + pixelFormat +
-        ', transparency: ' + isTransparent);
-    testCanvas.convertToBlob(encodeOptions).then(
-        t.step_func_done(function(blob) {
-            if (isTransparent)
-                testImageBitmapTransparent(blob);
-            else
-                testImageBitmapOpaque(blob);
-        }));
+    promise_test(async () => {
+        let canvasPixelFormat = 'uint8';
+        if (pixelFormat == 'uint16')
+            canvasPixelFormat = 'float16';
+        let testCanvas;
+        if (isTransparent)
+            testCanvas = initializeTestCanvasTransparent('srgb', canvasPixelFormat);
+        else
+            testCanvas = initializeTestCanvas('srgb', canvasPixelFormat);
+        const blob = await testCanvas.convertToBlob({
+            quality: 1,
+            type: 'image/png',
+            pixelFormat,
+        });
+        if (isTransparent)
+            await testImageBitmapTransparent(blob);
+        else
+            await testImageBitmapOpaque(blob);
+    }, 'createImageBitmap in e-sRGB from color managed Blob' +
+       ' with resize. blobPixelFormat: ' + pixelFormat +
+       ', transparency: ' + isTransparent);
 }
 
 function runAllCreateImageBitmapFromColorManagedBlobTests() {
@@ -444,67 +427,67 @@ runAllCreateImageBitmapFromColorManagedBlobTests();
 ////////////////////////////////////////////////////////////////////////////////
 
 // ImageData - Opaque sRGB
-promise_test(function() {
+promise_test(async () => {
     var canvas = initializeTestCanvas('srgb', 'uint8');
     var ctx = canvas.getContext('2d');
     var data = ctx.getImageData(0, 0, 20, 20);
-    return testImageBitmapOpaque(data);
+    await testImageBitmapOpaque(data);
 }, 'createImageBitmap in e-sRGB from an opaque sRGB ImageData with resize.');
 
 // ImageData - Opaque e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var canvas = initializeTestCanvas('srgb', 'float16');
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
     var data = ctx.getImageData(0, 0, 20, 20);
-    return testImageBitmapOpaque(data);
+    await testImageBitmapOpaque(data);
 }, 'createImageBitmap in e-sRGB from an opaque e-sRGB ImageData with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // ImageData - Transparent sRGB
-promise_test(function() {
+promise_test(async () => {
     var canvas = initializeTestCanvasTransparent('srgb', 'uint8');
     var ctx = canvas.getContext('2d');
     var data = ctx.getImageData(0, 0, 20, 20);
-    return testImageBitmapTransparent(data);
+    await testImageBitmapTransparent(data);
 }, 'createImageBitmap in e-sRGB from a transparent sRGB ImageData with resize.');
 
 // ImageData - Transparent e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var canvas = initializeTestCanvasTransparent('srgb', 'float16');
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
     var data = ctx.getImageData(0, 0, 20, 20);
-    return testImageBitmapTransparent(data);
+    await testImageBitmapTransparent(data);
 }, 'createImageBitmap in e-sRGB from a transparent e-sRGB ImageData with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // ImageBitmap - Opaque sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvas('srgb', 'uint8');
-    return createImageBitmap(testCanvas).then(testImageBitmapOpaque);
+    await createImageBitmap(testCanvas).then(testImageBitmapOpaque);
 }, 'createImageBitmap in e-sRGB from an opaque sRGB ImageBitmap with resize.');
 
 // ImageBitmap - Opaque e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvas('srgb', 'float16');
-    return createImageBitmap(testCanvas).then(testImageBitmapOpaque);
+    await createImageBitmap(testCanvas).then(testImageBitmapOpaque);
 }, 'createImageBitmap in e-sRGB from an opaque e-sRGB ImageBitmap with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
 
 // ImageBitmap - Transparent sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvasTransparent('srgb', 'uint8');
-    return createImageBitmap(testCanvas).then(testImageBitmapTransparent);
+    await createImageBitmap(testCanvas).then(testImageBitmapTransparent);
 }, 'createImageBitmap in e-sRGB from a transparent sRGB ImageBitmap with resize.');
 
 // ImageBitmap - Transparent e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var testCanvas = initializeTestCanvasTransparent('srgb', 'float16');
-    return createImageBitmap(testCanvas).then(testImageBitmapTransparent);
+    await createImageBitmap(testCanvas).then(testImageBitmapTransparent);
 }, 'createImageBitmap in e-sRGB from a transparent e-sRGB ImageBitmap with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -529,15 +512,15 @@ function initializeOffscreenCanvas(canvasColorSpace, canvasPixelFormat)
 }
 
 //OffscreenCanvas - Opaque sRGB
-promise_test(function() {
+promise_test(async () => {
     var offscreen = initializeOffscreenCanvas('srgb', 'uint8');
-    return testImageBitmapOpaque(offscreen);
+    await testImageBitmapOpaque(offscreen);
 }, 'createImageBitmap in e-sRGB from an opaque sRGB OffscreenCanvas with resize.');
 
 //OffscreenCanvas - Opaque e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var offscreen = initializeOffscreenCanvas('srgb', 'float16');
-    return testImageBitmapOpaque(offscreen);
+    await testImageBitmapOpaque(offscreen);
 }, 'createImageBitmap in e-sRGB from an opaque e-sRGB OffscreenCanvas with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -562,15 +545,15 @@ function initializeOffscreenCanvasTransparent(canvasColorSpace, canvasPixelForma
 }
 
 //OffscreenCanvas - Transparent sRGB
-promise_test(function() {
+promise_test(async () => {
     var offscreen = initializeOffscreenCanvasTransparent('srgb', 'uint8');
-    return testImageBitmapTransparent(offscreen);
+    await testImageBitmapTransparent(offscreen);
 }, 'createImageBitmap in e-sRGB from a transparent sRGB OffscreenCanvas with resize.');
 
 //OffscreenCanvas - Transparent e-sRGB
-promise_test(function() {
+promise_test(async () => {
     var offscreen = initializeOffscreenCanvasTransparent('srgb', 'float16');
-    return testImageBitmapTransparent(offscreen);
+    await testImageBitmapTransparent(offscreen);
 }, 'createImageBitmap in e-sRGB from a transparent e-sRGB OffscreenCanvas with resize.');
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
index a6b202e8f2b..f153a983d93 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-createPutGetImageData-colorManaged.html
@@ -76,17 +76,6 @@ runGetImageDataTests();
 
 // Test putImageData when the canvas is color managed.
 
-var dataU8 = new Uint8ClampedArray(4 * xWidth * xHeight);
-var dataU16 = new Uint16Array(4 * xWidth * xHeight);
-var dataF32 = new Float32Array(4 * xWidth * xHeight);
-function prepareDataArrays() {
-  for (i = 0; i < 4 * xWidth * xHeight; i++) {
-    dataU8[i] = (i % 4 == 3) ? 255 : i % 256;
-    dataU16[i] = dataU8[i] * 257;
-    dataF32[i] = dataU8[i] / 255.0;
-  }
-}
-
 var testScenariosPutImageData = [];
 function prepareTestScenariosPutImageData() {
   var colorSpaces = ["srgb"];
@@ -108,25 +97,24 @@ function prepareTestScenariosPutImageData() {
         }
 }
 
-function createAndPutImageData(data, imageDataColorSettings, canvasColorSettings) {
+function createAndPutImageData(imageDataColorSettings, canvasColorSettings) {
   // create color managed canvas
   var aCanvas = document.createElement("canvas");
   aCanvas.width = xWidth;
   aCanvas.height = xHeight;
   var ctx = aCanvas.getContext('2d', canvasColorSettings);
   // create color managed ImageData
-  var imageData = ctx.createImageData(data, xWidth, xHeight, imageDataColorSettings);
+  var imageData = ctx.createImageData(xWidth, xHeight, imageDataColorSettings);
   // put image data into canvas. test succeeds if this does not crash.
   ctx.putImageData(imageData, 0, 0);
 }
 
 function runTestPutImageData(imageDataColorSettings, canvasColorSettings) {
-  createAndPutImageData(dataU8, imageDataColorSettings, canvasColorSettings);
-  createAndPutImageData(dataU16, imageDataColorSettings, canvasColorSettings);
-  createAndPutImageData(dataF32, imageDataColorSettings, canvasColorSettings);
+  createAndPutImageData(imageDataColorSettings, canvasColorSettings);
+  createAndPutImageData(imageDataColorSettings, canvasColorSettings);
+  createAndPutImageData(imageDataColorSettings, canvasColorSettings);
 }
 
-prepareDataArrays();
 prepareTestScenariosPutImageData();
 
 function runPutImageDataTests() {
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html
index f5f0e629dd1..c38da7c95c0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/canvas-getImageData-e_srgb.html
@@ -39,13 +39,12 @@ function putImageData_e_sRGBThenGetImageData_e_sRGB_InRange() {
     canvas.height = 10;
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'})
-    var data_e_sRGB = new Float32Array(4);
-    data_e_sRGB[0] = 0.2;
-    data_e_sRGB[1] = 0.4;
-    data_e_sRGB[2] = 0.6;
-    data_e_sRGB[3] = 0.8;
-    var imageData = ctx.createImageData(data_e_sRGB, 1, 1,
+    var imageData = ctx.createImageData(1, 1,
         {colorSpace: 'srgb', storageFormat:'float32'});
+    imageData.dataUnion[0] = 0.2;
+    imageData.dataUnion[1] = 0.4;
+    imageData.dataUnion[2] = 0.6;
+    imageData.dataUnion[3] = 0.8;
     ctx.putImageData(imageData, 5, 5);
     var pixel = ctx.getImageData(5, 5, 1, 1).dataUnion;
     // Check against the same color in e-sRGB. 0.001 protects the test against
@@ -59,13 +58,12 @@ function putImageData_e_sRGBThenGetImageData_e_sRGB_OutOfRange() {
     canvas.height = 10;
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'})
-    var data_e_sRGB = new Float32Array(4);
-    data_e_sRGB[0] = 1.3;
-    data_e_sRGB[1] = -1.13;
-    data_e_sRGB[2] = 0.7;
-    data_e_sRGB[3] = 1.8;
-    var imageData = ctx.createImageData(data_e_sRGB, 1, 1,
+    var imageData = ctx.createImageData(1, 1,
         {colorSpace: 'srgb', storageFormat:'float32'});
+    imageData.dataUnion[0] = 1.3;
+    imageData.dataUnion[1] = -1.13;
+    imageData.dataUnion[2] = 0.7;
+    imageData.dataUnion[3] = 1.8;
     ctx.putImageData(imageData, 5, 5);
     var pixel = ctx.getImageData(5, 5, 1, 1).dataUnion;
     // Check against the same color in e-sRGB. 0.001 protects the test against
@@ -80,12 +78,12 @@ function putImageDataSRGBThenGetImageData_e_sRGB() {
     var ctx = canvas.getContext('2d',
         {colorSpace: 'srgb', pixelFormat:'float16'});
     var dataSRGB = new Uint8ClampedArray(4);
-    dataSRGB[0] = 51;
-    dataSRGB[1] = 102;
-    dataSRGB[2] = 153;
-    dataSRGB[3] = 204;
-    var imageData = ctx.createImageData(dataSRGB, 1, 1,
+    var imageData = ctx.createImageData(1, 1,
         {colorSpace: 'srgb', storageFormat:'uint8'});
+    imageData.data[0] = 51;
+    imageData.data[1] = 102;
+    imageData.data[2] = 153;
+    imageData.data[3] = 204;
     ctx.putImageData(imageData, 5, 5);
     var pixel = ctx.getImageData(5, 5, 1, 1).dataUnion;
     // Check against the same color in e-sRGB. 0.01 protects the test against
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
index 6bc55b7ca70..dda9f9cc28f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
+++ b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorManagedBehavior.html
@@ -336,29 +336,6 @@ function runTestCreateImageDataDWHC(canvasColorSettings, imageData) {
                       "ImageData should be transparent black");
 }
 
-var testScenariosCreateImageDataDWHC = [];
-for (var i = 0; i < canvasColorSettingsSet.length; i++) {
-  for (var j = 0; j < imageDataColorSettingsSet.length; j++) {
-    message = "Test createImageData(data, width, height, imageDataColorSettings): " +
-              canvasColorSettingsSet[i].name + " canvas, " +
-              imageDataColorSettingsSet[j].name + " ImageData";
-    testScenariosCreateImageDataDWHC.
-        push([message, canvasColorSettingsSet[i].colorSettings,
-              imageDataColorSettingsSet[j].imageData]);
-  }
-}
-
-function runTestCreateImageDataDWHCTests() {
-  for (var i = 0; i < testScenariosCreateImageDataDWHC.length; i++){
-    var t = test(function() {
-      runTestCreateImageDataDWHC(
-        testScenariosCreateImageDataDWHC[i][1],
-        testScenariosCreateImageDataDWHC[i][2]);
-    }, testScenariosCreateImageDataDWHC[i][0]);
-  }
-}
-runTestCreateImageDataDWHCTests();
-
 ////////////////////////////////////////////////////////////////////////////////
 
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html b/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html
deleted file mode 100644
index 9023cbea362..00000000000
--- a/tests/wpt/web-platform-tests/html/canvas/element/manual/wide-gamut-canvas/imageData-colorSpace.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<body>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-
-var dataU8 = new Uint8ClampedArray([255, 192, 128, 64]);
-var dataU16 = new Uint16Array([65535, 256*192, 256*128, 256*64]);
-var dataF32 = new Float32Array([1.0, 0.75, 0.5, 0.25]);
-
-function checkDataTypeAgainstStorageFormat(data, storageFormat) {
-  if (storageFormat == "uint8")
-    assert_equals(Object.prototype.toString.call(data), "[object Uint8ClampedArray]");
-  else if (storageFormat == "uint16")
-    assert_equals(Object.prototype.toString.call(data), "[object Uint16Array]");
-  else if (storageFormat == "float32")
-    assert_equals(Object.prototype.toString.call(data), "[object Float32Array]");
-}
-
-function checkColorSettings(colorSettings, colorSpace, storageFormat) {
-  assert_equals(colorSettings.colorSpace, colorSpace);
-  assert_equals(colorSettings.storageFormat, storageFormat);
-}
-
-function runTest(colorSettings, expectedColorSettings) {
-  var canvas = document.createElement("canvas");
-  var ctx = canvas.getContext("2d");
-
-  imageData = ctx.createImageData(1, 1, colorSettings);
-  checkDataTypeAgainstStorageFormat(imageData.dataUnion, colorSettings.storageFormat);
-  assert_array_equals(imageData.dataUnion, [0, 0, 0, 0]);
-  checkColorSettings(imageData.getColorSettings(), expectedColorSettings.colorSpace, expectedColorSettings.storageFormat);
-
-  imageData = ctx.createImageData(dataU8, 1, 1, colorSettings);
-  assert_equals(Object.prototype.toString.call(imageData.dataUnion), "[object Uint8ClampedArray]");
-  assert_array_equals(imageData.dataUnion, dataU8);
-  checkColorSettings(imageData.getColorSettings(), expectedColorSettings.colorSpace, "uint8");
-
-  imageData = ctx.createImageData(dataU16, 1, 1, colorSettings);
-  assert_equals(Object.prototype.toString.call(imageData.dataUnion), "[object Uint16Array]");
-  assert_array_equals(imageData.dataUnion, dataU16);
-  checkColorSettings(imageData.getColorSettings(), expectedColorSettings.colorSpace, "uint16");
-
-  imageData = ctx.createImageData(dataF32, 1, 1, colorSettings);
-  assert_equals(Object.prototype.toString.call(imageData.dataUnion), "[object Float32Array]");
-  assert_array_equals(imageData.dataUnion, dataF32);
-  checkColorSettings(imageData.getColorSettings(), expectedColorSettings.colorSpace, "float32");
-}
-
-var testScenarios = [
-    ["Test default color settings: {undefined, undefined} -> {srgb, uint8}", {}, {colorSpace: "srgb", storageFormat: "uint8"}],
-
-    ["Test default color space: {undefined, float32} -> {srgb, float32}", {storageFormat: "float32"}, {colorSpace: "srgb", storageFormat: "float32"}],
-    ["Test default storage format: {srgb, undefined} -> {srgb, uint8}", {colorSpace: "srgb"}, {colorSpace: "srgb", storageFormat: "uint8"}],
-
-    ["Test color settings: {srgb, uint8}", {colorSpace: "srgb", storageFormat: "uint8"}, {colorSpace: "srgb", storageFormat: "uint8"}],
-    ["Test color settings: {srgb, uint16}", {colorSpace: "srgb", storageFormat: "uint16"}, {colorSpace: "srgb", storageFormat: "uint16"}],
-    ["Test color settings: {srgb, float32}", {colorSpace: "srgb", storageFormat: "float32"}, {colorSpace: "srgb", storageFormat: "float32"}],
-];
-
-function runAllTests() {
-  for (var i = 0; i < testScenarios.length; i++){
-    var t = test(function() {
-      runTest(testScenarios[i][1], testScenarios[i][2]);
-    }, testScenarios[i][0]);
-  }
-}
-runAllTests();
-
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.html
index 35cba368116..fa0e2ac5fc8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.commit.html
@@ -14,7 +14,7 @@ function verifyPlaceholder(placeholder, expectedR, expectedG, expectedB, expecte
     _assertPixel(canvas, 5,5, expectedR, expectedG, expectedB, expectedA, "5,5", expectedClrStr);
 }
 
-test(function() {
+async_test(function(t) {
     var placeholder = document.createElement('canvas');
     placeholder.width = placeholder.height = 10;
     var offscreenCanvas = placeholder.transferControlToOffscreen();
@@ -25,8 +25,9 @@ test(function() {
     // place holder contents should still be transparent black at this moment.
     verifyPlaceholder(placeholder, 0,0,0,0, "0,0,0,0");
     // Set timeout acts as a sync barrier to allow commit to propagate
-    setTimeout(function() {
+    t.step_timeout(function() {
         verifyPlaceholder(placeholder, 0,255,0,255, "0,255,0,255");
+        t.done();
     }, 0);
 }, "Test that calling OffscreenCanvas's commit pushes its contents to its placeholder.");
 
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html
index d88bf56ec2c..f4b2599141a 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-dedicated-worker.https.html
@@ -23,8 +23,10 @@ promise_test(async (t) => {
   const reports = (await new Promise(r => mc.port1.onmessage = r)).data;
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "enforce");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, worker_url);
 }, "COEP support on DedicatedWorker.")
@@ -37,8 +39,10 @@ promise_test(async (t) => {
   const reports = (await new Promise(r => mc.port1.onmessage = r)).data;
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "reporting");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, worker_url);
 }, "COEP-Report-Only support on DedicatedWorker.")
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html
index efb7e7a7795..b998ba7926e 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-document.https.html
@@ -32,8 +32,10 @@ promise_test(async (t) => {
   const reports = await waitReports(iframe);
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "enforce");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, iframe_url);
 }, "COEP support on document.")
@@ -44,8 +46,10 @@ promise_test(async (t) => {
   const reports = await waitReports(iframe);
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "reporting");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, iframe_url);
 }, "COEP-Report-Only support on document.")
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html
index b9ec8d95a59..96a328b2cc1 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-service-worker.https.html
@@ -29,8 +29,10 @@ promise_test(async (t) => {
   assert_not_equals(reports, 'TIMEOUT');
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "enforce");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, worker_url);
 }, "COEP support on ServiceWorker.");
@@ -50,8 +52,10 @@ promise_test(async (t) => {
   assert_not_equals(reports, 'TIMEOUT');
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "reporting");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, worker_url);
 }, "COEP-Report-Only support on ServiceWorker.");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html
index d7bd191a84e..34af988fc65 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting-shared-worker.https.html
@@ -21,8 +21,10 @@ promise_test(async (t) => {
   const reports = (await new Promise(r => mc.port1.onmessage = r)).data;
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "enforce");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, worker_url);
 }, "COEP support on SharedWorker.")
@@ -35,8 +37,10 @@ promise_test(async (t) => {
   const reports = (await new Promise(r => mc.port1.onmessage = r)).data;
   assert_equals(reports.length, 1);
   const report = reports[0];
-  assert_equals(report.body["blocked-url"], image_url);
+  assert_equals(report.body.blockedURL, image_url);
   assert_equals(report.body.type, "corp");
+  assert_equals(report.body.disposition, "reporting");
+  assert_equals(report.body.destination, "");
   assert_equals(report.type, "coep");
   assert_equals(report.url, worker_url);
 }, "COEP-Report-Only support on SharedWorker.")
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html
new file mode 100644
index 00000000000..da3a632a3c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<title>crossOriginIsolated permission</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+<script>
+const {ORIGIN, HTTPS_REMOTE_ORIGIN} = get_host_info();
+const PATH =
+  new URL('resources/cross-origin-isolated-frame.html', location).pathname;
+const PIPE =
+  '?pipe=' +
+  '|header(cross-origin-embedder-policy,require-corp)' +
+  '|header(cross-origin-resource-policy,cross-origin)';
+
+async function getCrossOriginIsolatedFor(t, url) {
+  const frame = document.createElement('iframe');
+  t.add_cleanup(() => frame.remove());
+  frame.src = url;
+  document.body.append(frame);
+
+  frame.addEventListener('error', t.unreached_func('frame.error'));
+  await new Promise((resolve) => {
+    frame.addEventListener('load', resolve);
+  });
+
+  const mc = new MessageChannel();
+  frame.contentWindow.postMessage({port: mc.port2}, '*', [mc.port2]);
+
+  const e = await new Promise((resolve) => {
+    mc.port1.onmessage = resolve;
+  });
+  assert_equals(typeof(e.data), 'boolean');
+  return e.data;
+}
+
+function generateTest(origin, value, expectation) {
+  // We use async_test, not promise_test here to run tests in parallel.
+  async_test((t) => {
+    let pipe = PIPE;
+    if (value !== undefined) {
+      pipe += `|header(permissions-policy,cross-origin-isolated=${value})`
+    }
+    const url = `${origin}${PATH}${pipe}`;
+    (async () => {
+      assert_equals(await getCrossOriginIsolatedFor(t, url), expectation);
+    })().then(() => t.done(), (e) => t.step(() => {throw e;}));
+  }, `origin = ${origin}, value = ${value}`);
+}
+
+generateTest(ORIGIN, undefined, true);
+generateTest(ORIGIN, '*', true);
+generateTest(ORIGIN, "'self'", true);
+generateTest(ORIGIN, "'none'", false);
+generateTest(HTTPS_REMOTE_ORIGIN, undefined, false);
+generateTest(HTTPS_REMOTE_ORIGIN, '*', true);
+generateTest(HTTPS_REMOTE_ORIGIN, "'self'", false);
+generateTest(HTTPS_REMOTE_ORIGIN, "'none'", false);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html.headers
new file mode 100644
index 00000000000..5f8621ef836
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html.headers
@@ -0,0 +1,2 @@
+Cross-Origin-Embedder-Policy: require-corp
+Cross-Origin-Opener-Policy: same-origin
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/header-parsing.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/header-parsing.https.html
new file mode 100644
index 00000000000..6da000d7ede
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/header-parsing.https.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <meta name="timeout" content="long">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+'use strict';
+function createIframe(t, values) {
+  const parent = document.createElement('iframe');
+  const child = document.createElement('iframe');
+  const params = values.map((value) => {
+    const percentEncodedValue = typeof value === "object" ? value.percentEncoded : encodeURIComponent(value);
+    return `value=${percentEncodedValue}`;
+  });
+  parent.setAttribute('src', `resources/empty-coep.py?${params.join("&")}`);
+  document.body.appendChild(parent);
+  t.add_cleanup(() => parent.remove());
+
+  return new Promise((resolve, reject) => {
+      parent.onload = resolve;
+      parent.onerror = () =>
+        reject(new Error(`failed to load from ${parent.src}`));
+    })
+    .then(() => {
+        child.setAttribute('src', '/common/blank.html');
+        parent.contentDocument.body.appendChild(child);
+        return new Promise((resolve) => {
+            child.onload = resolve;
+            child.onerror = () =>
+              reject(new Error(`failed to load from ${child.src}`));
+          });
+      })
+    .then(() => child);
+}
+
+[
+  [],
+  [''],
+  ['jibberish'],
+  [{ percentEncoded: 'require%FFcorp' }], // non-ASCII byte
+  ['require-corp;'],
+  ['\u000brequire-corp\u000b'], // vertical tab
+  ['\u000crequire-corp\u000c'], // form feed
+  ['\u000drequire-corp\u000d'], // carriage return
+  ['Require-corp'],
+  ['"require-corp"'], // HTTP structured header "string" item
+  [':cmVxdWlyZS1jb3Jw:'], // HTTP structured header "byte sequence" item
+  ['require-corp;\tfoo=bar'],
+  ['require-corp require-corp'],
+  ['require-corp,require-corp'],
+  ['require-corp', 'require-corp'],
+  ['', 'require-corp'],
+  ['require-corp', ''],
+].forEach((values) => {
+  promise_test((t) => {
+    return createIframe(t, values)
+      .then((child) => {
+          assert_not_equals(child.contentDocument, null);
+        });
+  }, 'navigation allowed for ' + JSON.stringify(values));
+});
+
+[
+  ['require-corp'],
+  [' require-corp '],
+  ['\trequire-corp\t'], // leading and trailing OWS is not part of the field-value per HTTP
+  [' \trequire-corp'],
+  ['require-corp\t '],
+  ['require-corp; foo=bar'],
+  ['require-corp;require-corp'],
+
+].forEach((values) => {
+  promise_test((t) => {
+    return createIframe(t, values)
+      .then((child) => {
+          assert_equals(child.contentDocument, null);
+        });
+  }, 'navigation blocked for ' + JSON.stringify(values));
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html
index deb046cdb37..b539561effd 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-none.https.html
@@ -77,9 +77,13 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   const URL = remote(
-    '/common/blank.html?pipe=header(access-control-allow-origin,*');
+    '/common/blank.html?pipe=header(access-control-allow-origin,*)');
   await fetch(URL, {mode: 'cors'});
 }, 'making a cross-origin request with CORS');
 
+promise_test(async (t) => {
+  const URL = remote('/fetch/api/resources/preflight.py?allow_headers=hoge');
+  await fetch(URL, {mode: 'cors', headers: {'hoge': 'fuga'}});
+}, 'making a cross-origin request with CORS-preflight');
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html
index 88c0d2cf6fb..36cf4a153bf 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none-sw-from-require-corp.https.html
@@ -80,9 +80,14 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   const URL = remote(
-    '/common/blank.html?pipe=header(access-control-allow-origin,*');
+    '/common/blank.html?pipe=header(access-control-allow-origin,*)');
   await fetch(URL, {mode: 'cors'});
 }, 'making a cross-origin request with CORS');
 
+promise_test(async (t) => {
+  const URL = remote('/fetch/api/resources/preflight.py?allow_headers=hoge');
+  await fetch(URL, {mode: 'cors', headers: {'hoge': 'fuga'}});
+}, 'making a cross-origin request with CORS-preflight');
+
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html
index 0fbd4165a5f..24b1fce1764 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/none.https.html
@@ -11,6 +11,7 @@ const HOST = get_host_info();
 const BASE = new URL("resources", location).pathname;
 
 async_test(t => {
+  t.step_timeout(t.unreached_func('timeout'), 10 * 1000);
   const frame = document.createElement("iframe");
   t.add_cleanup(() => frame.remove());
   frame.onload = t.step_func_done(() => {
@@ -22,6 +23,7 @@ async_test(t => {
 }, `"none" top-level: navigating a frame to "none" should succeed`);
 
 async_test(t => {
+  t.step_timeout(t.unreached_func('timeout'), 10 * 1000);
   const frame = document.createElement("iframe");
   t.add_cleanup(() => frame.remove());
   const blank = "/common/blank.html";
@@ -42,6 +44,7 @@ async_test(t => {
 }, `"none" top-level: navigating a frame from "require-corp" to "none" should succeed`);
 
 async_test(t => {
+  t.step_timeout(t.unreached_func('timeout'), 10 * 1000);
   const w = window.open(`resources/navigate-none.sub.html?to=navigate-require-corp.sub.html`, "window_name");
   t.add_cleanup(() => w.close());
 
@@ -53,6 +56,7 @@ async_test(t => {
 }, `"none" top-level: navigating a frame back from "require-corp" should succeed`);
 
 async_test(t => {
+  t.step_timeout(t.unreached_func('timeout'), 10 * 1000);
   let pageLoaded = false;
   const bc = new BroadcastChannel(token());
   let finished = false;
@@ -83,6 +87,7 @@ async_test(t => {
 }, `"require-corp" top-level noopener popup: navigating to "none" should succeed`);
 
 async_test(t => {
+  t.step_timeout(t.unreached_func('timeout'), 10 * 1000);
   const frame = document.createElement("iframe");
   const id = token();
   t.add_cleanup(() => frame.remove());
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-navigation.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-navigation.https.html
index 7087985990e..680cc6af29a 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-navigation.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-navigation.https.html
@@ -15,18 +15,21 @@ const CORP_CROSS_ORIGIN =
 const FRAME_URL = `${ORIGIN}/common/blank.html?pipe=`;
 const REMOTE_FRAME_URL = `${REMOTE_ORIGIN}/common/blank.html?pipe=`;
 
-function checkCorpReport(report, contextUrl, blockedUrl) {
+function checkCorpReport(report, contextUrl, blockedUrl, disposition) {
   assert_equals(report.type, 'coep');
   assert_equals(report.url, contextUrl);
   assert_equals(report.body.type, 'corp');
-  assert_equals(report.body['blocked-url'], blockedUrl);
+  assert_equals(report.body.blockedURL, blockedUrl);
+  assert_equals(report.body.disposition, disposition);
+  assert_equals(report.body.destination, 'iframe');
 }
 
-function checkCoepMismatchReport(report, contextUrl, blockedUrl) {
+function checkCoepMismatchReport(report, contextUrl, blockedUrl, disposition) {
   assert_equals(report.type, 'coep');
   assert_equals(report.url, contextUrl);
   assert_equals(report.body.type, 'navigation');
-  assert_equals(report.body['blocked-url'], blockedUrl);
+  assert_equals(report.body.blockedURL, blockedUrl);
+  assert_equals(report.body.disposition, disposition);
 }
 
 function loadFrame(document, url) {
@@ -82,9 +85,6 @@ async function observeReports(global) {
 //     'CORP-RO' CORP violation (report only)
 //     'NAV': COEP mismatch between the frames.
 //     'NAV-RO': COEP mismatch between the frames (report only).
-//   Currently '-RO' is no-op, e.g., 'CORP' and 'CORP-RO' have the same
-//   expectation. We are planning to introduce "disposition" member in
-//   reports, which will differentiate them each other.
 const CASES = [
   { parent: '', target: '', reports: [] },
   { parent: '', target: COEP, reports: [] },
@@ -124,12 +124,16 @@ for (const testcase of CASES) {
           const report = reports[i];
           switch (testcase.reports[i]) {
             case 'CORP':
+              checkCorpReport(report, contextUrl, targetUrl, 'enforce');
+              break;
             case 'CORP-RO':
-              checkCorpReport(report, contextUrl, targetUrl);
+              checkCorpReport(report, contextUrl, targetUrl, 'reporting');
               break;
             case 'NAV':
+              checkCoepMismatchReport(report, contextUrl, targetUrl, 'enforce');
+              break;
             case 'NAV-RO':
-              checkCoepMismatchReport(report, contextUrl, targetUrl);
+              checkCoepMismatchReport(report, contextUrl, targetUrl, 'reporting');
               break;
             default:
               assert_unreached(
@@ -146,4 +150,4 @@ for (const testcase of CASES) {
 }
 
 </script>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html
index 5314ec93550..ad8a8e99eb9 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-subresource-corp.https.html
@@ -21,11 +21,13 @@ function wait(ms) {
   return new Promise(resolve => step_timeout(resolve, ms));
 }
 
-function checkReport(report, contextUrl, blockedUrl) {
+function checkReport(report, contextUrl, blockedUrl, disposition, destination) {
   assert_equals(report.type, 'coep');
   assert_equals(report.url, contextUrl);
   assert_equals(report.body.type, 'corp');
-  assert_equals(report.body['blocked-url'], blockedUrl);
+  assert_equals(report.body.blockedURL, blockedUrl);
+  assert_equals(report.body.disposition, disposition);
+  assert_equals(report.body.destination, destination);
 }
 
 async function fetchInFrame(t, frameUrl, url) {
@@ -146,20 +148,18 @@ const CASES = [{
   name: 'blocked due to COEP',
   url: `${REMOTE_ORIGIN}/common/text-plain.txt`,
   check: (reports, contextUrl, url) => {
-    // One for COEP, one for COEP-RO.
     assert_equals(reports.length, 2);
-    checkReport(reports[0], contextUrl, url);
-    checkReport(reports[1], contextUrl, url);
+    checkReport(reports[0], contextUrl, url, 'reporting', '');
+    checkReport(reports[1], contextUrl, url, 'enforce', '');
   }
 }, {
   name: 'blocked during redirect',
   url: `${ORIGIN}/common/redirect.py?location=` +
        encodeURIComponent(`${REMOTE_ORIGIN}/common/text-plain.txt`),
   check: (reports, contextUrl, url) => {
-    // One for COEP, one for COEP-RO.
     assert_equals(reports.length, 2);
-    checkReport(reports[0], contextUrl, url);
-    checkReport(reports[1], contextUrl, url);
+    checkReport(reports[0], contextUrl, url, 'reporting', '');
+    checkReport(reports[1], contextUrl, url, 'enforce', '');
   },
 }];
 
@@ -173,4 +173,29 @@ for (const env of ENVIRONMENTS) {
   }
 }
 
+// A test for a non-empty destination.
+promise_test(async (t) => {
+  const reports = [];
+  const frame = await with_iframe(FRAME_URL);
+  t.add_cleanup(() => frame.remove());
+
+  const observer = new frame.contentWindow.ReportingObserver((rs) => {
+    for (const report of rs) {
+      reports.push(report.toJSON());
+    }
+  });
+  observer.observe();
+  const url = `${REMOTE_ORIGIN}/common/utils.js`;
+  const script = frame.contentDocument.createElement('script');
+  script.src = url;
+  frame.contentDocument.body.appendChild(script);
+
+  // Wait 200ms for reports to settle.
+  await wait(200);
+
+  assert_equals(reports.length, 2);
+  checkReport(reports[0], FRAME_URL, url, 'reporting', 'script');
+  checkReport(reports[1], FRAME_URL, url, 'enforce', 'script');
+}, 'destination: script');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html
index cfff7bcb9e8..02c719da737 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting-to-endpoint.https.html
@@ -44,7 +44,7 @@ const reportsForReportOnly = [];
 pollReports('endpoint', reports);
 pollReports('report-only-endpoint', reportsForReportOnly);
 
-function checkCorpReportExistence(reports, blockedUrl, contextUrl) {
+function checkCorpReportExistence(reports, blockedUrl, contextUrl, destination, disposition) {
   blockedUrl = new URL(blockedUrl, location).href;
   contextUrl = new URL(contextUrl, location).href;
   for (const report of reports) {
@@ -52,14 +52,16 @@ function checkCorpReportExistence(reports, blockedUrl, contextUrl) {
         report.body.type !== 'corp') {
       continue;
     }
-    if (report.body['blocked-url'] === blockedUrl) {
+    if (report.body.blockedURL === blockedUrl &&
+        report.body.disposition === disposition) {
+      assert_equals(report.body.destination, destination);
       return;
     }
   }
-  assert_unreached(`A report whose blocked-url is ${blockedUrl} and url is ${contextUrl} is not found.`);
+  assert_unreached(`A report whose blockedURL is ${blockedUrl} and url is ${contextUrl} is not found.`);
 }
 
-function checkNavigationReportExistence(reports, blockedUrl, contextUrl) {
+function checkNavigationReportExistence(reports, blockedUrl, contextUrl, disposition) {
   blockedUrl = new URL(blockedUrl, location).href;
   contextUrl = new URL(contextUrl, location).href;
   for (const report of reports) {
@@ -67,11 +69,12 @@ function checkNavigationReportExistence(reports, blockedUrl, contextUrl) {
         report.body.type !== 'navigation') {
       continue;
     }
-    if (report.body['blocked-url'] === blockedUrl) {
+    if (report.body.blockedURL === blockedUrl &&
+        report.body.disposition === disposition) {
       return;
     }
   }
-  assert_unreached(`A report whose blocked-url is ${blockedUrl} and url is ${contextUrl} is not found.`);
+  assert_unreached(`A report whose blockedURL is ${blockedUrl} and url is ${contextUrl} is not found.`);
 }
 
 async_test(async (t) => {
@@ -94,8 +97,9 @@ async_test(async (t) => {
     // Wait 3 seconds for reports to settle.
     await wait(3000);
 
-    checkCorpReportExistence(reports, url, iframe.src);
-    checkCorpReportExistence(reportsForReportOnly, url, iframe.src);
+    checkCorpReportExistence(reports, url, iframe.src, '', 'enforce');
+    checkCorpReportExistence(
+      reportsForReportOnly, url, iframe.src, '', 'reporting');
 
     t.done();
   } catch (e) {
@@ -130,8 +134,9 @@ async_test(async (t) => {
     // Wait 3 seconds for reports to settle.
     await wait(3000);
 
-    checkCorpReportExistence(reports, url, iframe.src);
-    checkCorpReportExistence(reportsForReportOnly, url, iframe.src);
+    checkCorpReportExistence(reports, url, iframe.src, 'iframe', 'enforce');
+    checkCorpReportExistence(
+      reportsForReportOnly, url, iframe.src, 'iframe', 'reporting');
 
     t.done();
   } catch (e) {
@@ -158,9 +163,9 @@ async_test(async (t) => {
     // Wait 3 seconds for reports to settle.
     await wait(3000);
 
-    checkNavigationReportExistence(reports, targetUrl, iframe.src);
+    checkNavigationReportExistence(reports, targetUrl, iframe.src, 'enforce');
     checkNavigationReportExistence(
-      reportsForReportOnly, targetUrl, iframe.src);
+      reportsForReportOnly, targetUrl, iframe.src, 'reporting');
 
     t.done();
   } catch (e) {
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html
index adb73bfba45..a60b8bd457e 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-none.https.html
@@ -79,9 +79,14 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   const URL = remote(
-    '/common/blank.html?pipe=header(access-control-allow-origin,*');
+    '/common/blank.html?pipe=header(access-control-allow-origin,*)');
   await fetch(URL, {mode: 'cors'});
 }, 'making a cross-origin request with CORS');
 
+promise_test(async (t) => {
+  const URL = remote('/fetch/api/resources/preflight.py?allow_headers=hoge');
+  await fetch(URL, {mode: 'cors', headers: {'hoge': 'fuga'}});
+}, 'making a cross-origin request with CORS-preflight');
+
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html
index 0696b7a33cc..deefc92b804 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/require-corp-sw-from-require-corp.https.html
@@ -81,9 +81,13 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   const URL = remote(
-    '/common/blank.html?pipe=header(access-control-allow-origin,*');
+    '/common/blank.html?pipe=header(access-control-allow-origin,*)');
   await fetch(URL, {mode: 'cors'});
 }, 'making a cross-origin request with CORS');
 
+promise_test(async (t) => {
+  const URL = remote('/fetch/api/resources/preflight.py?allow_headers=hoge');
+  await fetch(URL, {mode: 'cors', headers: {'hoge': 'fuga'}});
+}, 'making a cross-origin request with CORS-preflight');
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/cross-origin-isolated-frame.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/cross-origin-isolated-frame.html
new file mode 100644
index 00000000000..b79fe288b3b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/cross-origin-isolated-frame.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+<body>
+<script>
+self.addEventListener('message', (e) => {
+  e.data.port.postMessage(self.crossOriginIsolated);
+});
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/empty-coep.py b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/empty-coep.py
new file mode 100644
index 00000000000..d0e547b130d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/empty-coep.py
@@ -0,0 +1,7 @@
+def main(request, response):
+    headers = [(b'Content-Type', b'text/html')]
+
+    for value in request.GET.get_list(b'value'):
+        headers.append((b'Cross-Origin-Embedder-Policy', value))
+
+    return (200, headers, u'')
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html
new file mode 100644
index 00000000000..bd3a55a2d8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox-navigate.https.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<title>CSP sandbox popup navigate to Cross-Origin-Opener-Policy document should work</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
+<div id=log>
+<script>
+[
+  "allow-popups allow-scripts allow-same-origin",
+  "allow-popups allow-scripts",
+].forEach(sandboxValue => {
+  async_test(t => {
+    const channel = new BroadcastChannel(token());
+    let popup;
+    channel.onmessage = t.step_func_done(e => {
+      assert_equals(e.data.name, '', 'e.data.name');
+      assert_false(e.data.opener, 'e.data.opener');
+      // `popup` is still the WindowProxy that holds the CSP sandbox document, not the
+      // after-navigation COOP document. The CSP sandbox only applies to the before navigation
+      // document/window.
+      assert_true(popup.closed, 'popup.closed');
+      // Same-origin check (with the CSP sandbox document) should not throw when 'allow-same-origin'
+      if (sandboxValue.includes('allow-same-origin')) {
+        assert_true(!!popup.document, 'same-origin check');
+      } else {
+        assert_throws_dom("SecurityError", () => { popup.document; }, 'same-origin check');
+      }
+    });
+    const navigateTo = `/html/cross-origin-opener-policy/resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}`;
+    popup = window.open(`resources/csp-sandbox.py?coop=&coep=&sandbox=${sandboxValue}&channel=&navigate=${encodeURIComponent(navigateTo)}`, sandboxValue.replace(/ /g, '_'));
+    t.add_cleanup(() => { popup.close(); });
+    addEventListener('load', t.step_func(() => {
+      t.step_timeout(() => {
+        assert_unreached('Navigation from CSP sandbox to COOP document failed')
+      }, 1500);
+    }));
+  }, `CSP: sandbox ${sandboxValue}; ${document.title}`);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html
new file mode 100644
index 00000000000..259d484df2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-csp-sandbox.https.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<title>CSP sandboxed Cross-Origin-Opener-Policy popup should result in a network error</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
+<div id=log>
+<script>
+[
+  "allow-popups allow-scripts allow-same-origin",
+  "allow-popups allow-scripts",
+].forEach(sandboxValue => {
+  async_test(t => {
+    const channel = new BroadcastChannel(token());
+    channel.onmessage = t.unreached_func("A COOP popup was created from a CSP-sandboxed popup");
+    const popup = window.open(`resources/csp-sandbox.py?coop=same-origin&coep=&sandbox=${sandboxValue}&channel=${channel.name}`);
+    t.add_cleanup(() => { popup.close(); });
+    addEventListener('load', t.step_func(() => {
+      t.step_timeout(() => {
+        t.done()
+      }, 1500);
+    }));
+  }, `CSP: sandbox ${sandboxValue}; ${document.title}`);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html
index ceb744c215b..6f250c1b092 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-sandbox.https.html
@@ -29,6 +29,19 @@
   }, `<iframe sandbox="${sandboxValue}"> ${document.title}`);
 });
 
+// Verify that the popup does not have sandboxing flags set
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const channel = new BroadcastChannel(token());
+  channel.onmessage = t.step_func_done();
+  t.add_cleanup(() => frame.remove());
+  frame.sandbox = "allow-popups allow-scripts allow-popups-to-escape-sandbox";
+  frame.srcdoc = `<script>
+window.open("resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}");
+<\/script>`;
+  document.body.append(frame);
+}, `<iframe sandbox="allow-popups allow-scripts allow-popups-to-escape-sandbox"> ${document.title}`);
+
 async_test(t => {
   const frame = document.createElement("iframe");
   const channel = new BroadcastChannel(token());
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing.https.html
new file mode 100644
index 00000000000..2839c381b80
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/header-parsing.https.html
@@ -0,0 +1,52 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/common.js"></script>
+
+<div id=log></div>
+<script>
+
+let tests = [
+  // popup Origin, popup COOP, expect opener
+
+  // None of the following should be recognized as "same-origin" (hence the
+  // "expected opener" value of `true`).
+  [SAME_ORIGIN, { percentEncoded: "same%FForigin" }, true], // non-ASCII byte
+  [SAME_ORIGIN, "same-origin;", true],
+  [SAME_ORIGIN, "\u000bsame-origin\u000b", true], // vertical tab
+  [SAME_ORIGIN, "\u000csame-origin\u000c", true], // form feed
+  [SAME_ORIGIN, "\u000dsame-origin\u000d", true], // carriage return
+  [SAME_ORIGIN, "Same-origin", true],
+  [SAME_ORIGIN, "same-origin;\tfoo=bar", true],
+  [SAME_ORIGIN, "same-origin ;foo=bar", true],
+  [SAME_ORIGIN, "same-origin; foo=bar;", true],
+  [SAME_ORIGIN, "\"same-origin\"", true], // HTTP structured fields "string" item
+  [SAME_ORIGIN, ":c2FtZS1vcmlnaW4=:", true], // HTTP structured fields "byte sequence" item
+  [SAME_ORIGIN, "?1", true], // HTTP structured fields "boolean" item
+  [SAME_ORIGIN, "1", true], // HTTP structured fields "integer or decimal" item
+  [SAME_ORIGIN, "$same-origin", true], // the item type is unrecognized
+  [SAME_ORIGIN, "same-origin same-origin", true],
+  [SAME_ORIGIN, "same-origin,same-origin", true],
+  [SAME_ORIGIN, "*same-origin ", true],
+
+  // All of the following should be recognized as "same-origin" (hence the
+  // "expected opener" value of `false`).
+  [SAME_ORIGIN, " same-origin", false],
+  [SAME_ORIGIN, "same-origin ", false],
+  [SAME_ORIGIN, "\tsame-origin", false],
+  [SAME_ORIGIN, "same-origin\t", false],
+  [SAME_ORIGIN, "same-origin;same-origin", false],
+  [SAME_ORIGIN, "same-origin; foo=bar", false],
+];
+
+run_coop_tests("unspecified", tests);
+
+async_test((t) => {
+  const channelName = `none_to_${SAME_ORIGIN.name}_duplicated-header`;
+  const url = `${SAME_ORIGIN.origin}/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis?channel=${channelName}`;
+
+  url_test(t, url, channelName, true);
+}, `unspecified document opening popup to ${SAME_ORIGIN.origin} with repeated COOP header`);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/javascript-url.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/javascript-url.https.html
new file mode 100644
index 00000000000..a10c939ed50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/javascript-url.https.html
@@ -0,0 +1,262 @@
+<!DOCTYPE html>
+<title>Cross-Origin-Opener-Policy and a "javascript:" URL popup</title>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+
+<p>According to HTML's navigate algorithm, requests to <code>javascript:</code>
+URLs should inherit the cross-origin opener policy of the active document. To
+observe this, each subtest uses the following procedure.</p>
+
+<ol>
+  <li>create popup with a given COOP (the <code>parentCOOP</code>)</li>
+  <li>navigate the popup to a <code>javascript:</code> URL (the new document is
+  expected to inherit the <code>parentCOOP</code>)</li>
+  <li>from the popup, create a second popup window with a given COOP (the
+  <code>childCOOP</code>)</li>
+</ol>
+
+<p>Both popup windows inspect state and report back to the test context using
+BroadcastChannels.</p>
+
+<pre>
+    .---- test ----.
+    | open(https:) |
+    |  parentCOOP  |   .----- subject -------.
+    |      '---------> | --------.           |
+    |              |   |         v           |
+    |              |   | assign(javascript:) |
+    |              |   |  (COOP under test)  |
+    |              |   |         |           |
+    |              |   |    open(https:)     |
+    |              |   |     childCOOP       |    .- child -.
+    |              |   |         '--------------> |         |
+    |              |   '---------------------'    '---------'
+    |              |             |                     |
+    |  validate    | <--status---+---------------------'
+    '--------------'
+</pre>
+
+<script>
+'use strict';
+
+function run(t, parentCOOP, childCOOP, origin, name) {
+  const bc = new BroadcastChannel(name);
+  const childURL = encodeURIComponent(`${origin}/html/cross-origin-opener-policy/resources/coop-coep.py?coop=${childCOOP}&coep=&channel=${name}`);
+
+  open(
+    `/html/cross-origin-opener-policy/resources/javascript-url-same-origin.https.html` +
+      `?pipe=header(cross-origin-opener-policy,${parentCOOP})` +
+      `&childURL=${childURL}` +
+      `&childName=${name}`
+  );
+
+  t.add_cleanup(() => {
+    bc.postMessage('close');
+  });
+
+  return new Promise((resolve) => {
+    bc.addEventListener('message', ({data}) => {
+      resolve(data);
+    }, {once: true});
+  }).then(({name: childName, opener: childOpener}) => {
+    return new Promise((resolve) => {
+      bc.postMessage('inspectChild');
+
+      bc.addEventListener('message', function handle({data}) {
+        if (typeof data !== 'object' || !('childClosed' in data)) { return; }
+
+        bc.removeEventListener('message', handle);
+
+        resolve({
+          childName,
+          childOpener,
+          childClosed: data.childClosed
+        });
+      });
+    });
+  });
+}
+const { HTTPS_ORIGIN, HTTPS_REMOTE_ORIGIN } = get_host_info();
+
+function assert_isolated(results) {
+  assert_equals(results.childName, '', 'child name');
+  assert_false(results.childOpener, 'child opener');
+  // The test subject's reference to the  "child" window must report "closed"
+  // when COOP enforces isolation because the document initially created during
+  // the window open steps must be discarded when a new document object is
+  // created at the end of the navigation.
+  assert_true(results.childClosed, 'child closed');
+}
+
+function assert_not_isolated(results, expectedName) {
+  assert_equals(results.childName, expectedName, 'child name');
+  assert_true(results.childOpener, 'child opener');
+  assert_false(results.childClosed, 'child closed');
+}
+
+async_test((t) => {
+  const name = token();
+  run(t, 'unsafe-none', 'unsafe-none', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_not_isolated(results, name);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: unsafe-none; childCOOP: unsafe-none');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'unsafe-none', 'unsafe-none', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_not_isolated(results, name);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: unsafe-none; childCOOP: unsafe-none');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'unsafe-none', 'same-origin-allow-popups', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: unsafe-none; childCOOP: same-origin-allow-popups');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'unsafe-none', 'same-origin-allow-popups', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: unsafe-none; childCOOP: same-origin-allow-popups');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'unsafe-none', 'same-origin', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: unsafe-none; childCOOP: same-origin');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'unsafe-none', 'same-origin', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: unsafe-none; childCOOP: same-origin');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin-allow-popups', 'unsafe-none', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_not_isolated(results, name);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: same-origin-allow-popups; childCOOP: unsafe-none');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin-allow-popups', 'unsafe-none', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_not_isolated(results, name);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: same-origin-allow-popups; childCOOP: unsafe-none');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin-allow-popups', 'same-origin-allow-popups', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_not_isolated(results, name);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: same-origin-allow-popups; childCOOP: same-origin-allow-popups');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin-allow-popups', 'same-origin-allow-popups', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: same-origin-allow-popups; childCOOP: same-origin-allow-popups');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin-allow-popups', 'same-origin', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: same-origin-allow-popups; childCOOP: same-origin');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin-allow-popups', 'same-origin', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: same-origin-allow-popups; childCOOP: same-origin');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin', 'unsafe-none', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: same-origin; childCOOP: unsafe-none');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin', 'unsafe-none', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: same-origin; childCOOP: unsafe-none');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin', 'same-origin-allow-popups', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: same-origin; childCOOP: same-origin-allow-popups');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin', 'same-origin-allow-popups', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: same-origin; childCOOP: same-origin-allow-popups');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin', 'same-origin', HTTPS_ORIGIN, name)
+    .then((results) => {
+      assert_not_isolated(results, name);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: same origin; parentCOOP: same-origin; childCOOP: same-origin');
+
+async_test((t) => {
+  const name = token();
+  run(t, 'same-origin', 'same-origin', HTTPS_REMOTE_ORIGIN, name)
+    .then((results) => {
+      assert_isolated(results);
+    })
+    .then(t.step_func_done(), t.step_func((e) => { throw e; }));
+}, 'navigation: cross origin; parentCOOP: same-origin; childCOOP: same-origin');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html
similarity index 95%
rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html
rename to tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html
index 8b6e7caed75..fc7c192b6b6 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_opener-coop-ro.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html
@@ -58,11 +58,11 @@ promise_test(async t => {
   `);
 
   // 5. Check a report sent to the opener.
-  let report = await receiveReport(opener_report_token, "access-from-coop-page")
+  let report =
+    await receiveReport(opener_report_token, "access-from-coop-page-to-openee")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, opener_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-from-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_openee-coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html
similarity index 92%
rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_openee-coop-ro.https.html
rename to tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html
index 6c576def93a..d7384e21195 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_openee-coop-ro.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-opener_coop-ro.https.html
@@ -33,11 +33,11 @@ promise_test(async t => {
   `);
 
   // 2. Check a report is sent to the openee.
-  let report = await receiveReport(report_token, "access-from-coop-page")
+  let report =
+    await receiveReport(report_token, "access-from-coop-page-to-opener")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, openee_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-from-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html
new file mode 100644
index 00000000000..e5cc726c5e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html
@@ -0,0 +1,87 @@
+<title>
+  One window accesses a second one. They are aren't related by an opener/openee
+  relationship. The first window has set
+  Cross-Origin-Opener-Policy-Report-Only:same-origin, so it receives a
+  "access-from-coop-page-to-other" report.
+</title>
+<meta name=timeout content=long>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/get-host-info.sub.js></script>
+<script src="/common/utils.js"></script>
+<script src="../resources/dispatcher.js"></script>
+<script src="../resources/try-access.js"></script>
+<script>
+
+const directory = "/html/cross-origin-opener-policy/reporting";
+const executor_path = directory + "/resources/executor.html?pipe=";
+const same_origin = get_host_info().HTTPS_ORIGIN;
+const coep_header = '|header(Cross-Origin-Embedder-Policy,require-corp)';
+
+let escapeComma = url => url.replace(/,/g, '\\,');
+
+promise_test(async t => {
+  const report_token= token();
+  const report_to = reportToHeaders(report_token);
+
+  // The test window.
+  const this_window_token = token();
+
+  // The "opener" window. With COOP:same-origin + reporter.
+  const opener_token = token();
+  const opener_url = same_origin + executor_path + report_to.header +
+    report_to.coopReportOnlySameOriginHeader + coep_header +
+    `&uuid=${opener_token}`;
+
+  // The "openee" window. With COOP:same-origin + reporter.
+  const openee_token = token();
+  const openee_url = same_origin + executor_path + report_to.header +
+    report_to.coopReportOnlySameOriginHeader + coep_header +
+    `&uuid=${openee_token}`;
+
+  // The "other" window.
+  const other_token = token();
+  const other_url = same_origin + executor_path + report_to.header +
+    `&uuid=${other_token}`;
+
+  t.add_cleanup(() => {
+    send(opener_token, "window.close()")
+    send(openee_token, "window.close()")
+    send(other_token, "window.close()")
+  })
+
+  // 1. Create the "opener" window.
+  let opener_window_proxy = window.open(opener_url);
+
+  // 2. Create the "openee" window.
+  send(opener_token, `
+    window.openee = window.open('${escapeComma(openee_url)}');
+  `);
+
+  // 3. Create the "other" window.
+  send(openee_token, `
+    window.other = window.open('${escapeComma(other_url)}');
+  `);
+
+  // 4. Wait for "other" to load its document.
+  send(other_token, `send('${this_window_token}', "Loaded");`);
+  assert_equals(await receive(this_window_token), "Loaded");
+
+  // 5. "opener" accesses "other" window, through "openee".
+  send(opener_token, `
+    tryAccess(openee.other);
+  `);
+
+  // 6. Check a report is sent to the openee.
+  let report =
+    await receiveReport(report_token, "access-from-coop-page-to-other")
+  assert_not_equals(report, "timeout", "Report not received");
+  assert_equals(report.type, "coop");
+  assert_equals(report.url, opener_url.replace(/"/g, '%22'));
+  assert_equals(report.body.disposition, "reporting");
+  assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
+  assert_equals(report.body.property, "blur");
+  assert_source_location_found(report);
+}, "access-from-coop-page-to-other (COOP-RO)");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html
similarity index 94%
rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html
rename to tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html
index b6883de249a..e54d5e3fe1c 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/opener-accessed_opener-coop-ro.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html
@@ -52,11 +52,11 @@ promise_test(async t => {
   `);
 
   // 4. Check a report sent to the opener.
-  let report = await receiveReport(opener_report_token, "access-to-coop-page")
+  let report =
+    await receiveReport(opener_report_token, "access-to-coop-page-from-openee")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, opener_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-to-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_openee-coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html
similarity index 94%
rename from tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_openee-coop-ro.https.html
rename to tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html
index 1deedbde77b..ef969738c33 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/openee-accessed_openee-coop-ro.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-opener_coop-ro.https.html
@@ -39,11 +39,11 @@ promise_test(async t => {
   tryAccess(openee);
 
   // 3. Check a report is sent to the openee.
-  let report = await receiveReport(report_token, "access-to-coop-page")
+  let report =
+    await receiveReport(report_token, "access-to-coop-page-from-opener")
   assert_not_equals(report, "timeout", "Report not received");
   assert_equals(report.type, "coop");
   assert_equals(report.url, openee_url.replace(/"/g, '%22'));
-  assert_equals(report.body.type, "access-to-coop-page");
   assert_equals(report.body.disposition, "reporting");
   assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
   assert_equals(report.body.property, "blur");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html
new file mode 100644
index 00000000000..c349b9a708e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro.https.html
@@ -0,0 +1,75 @@
+<title>
+  One window accesses a second one. They are aren't related by an opener/openee
+  relationship. The second window has set
+  Cross-Origin-Opener-Policy-Report-Only:same-origin, so it receives a
+  "access-to-coop-page-from-other" report.
+</title>
+<meta name=timeout content=long>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/common/get-host-info.sub.js></script>
+<script src="/common/utils.js"></script>
+<script src="../resources/dispatcher.js"></script>
+<script src="../resources/try-access.js"></script>
+<script>
+
+const directory = "/html/cross-origin-opener-policy/reporting";
+const executor_path = directory + "/resources/executor.html?pipe=";
+const same_origin = get_host_info().HTTPS_ORIGIN;
+const coep_header = '|header(Cross-Origin-Embedder-Policy,require-corp)';
+
+promise_test(async t => {
+  // The test window.
+  const this_window_token = token();
+
+  // The "opener" window.
+  const opener_token = token();
+  const opener_url = same_origin + executor_path + `&uuid=${opener_token}`;
+
+  // The "openee" window. With COOP:same-origin + reporter.
+  const openee_report_token= token();
+  const openee_token = token();
+  const openee_reportTo = reportToHeaders(openee_report_token);
+  const openee_url = same_origin + executor_path + openee_reportTo.header +
+    openee_reportTo.coopReportOnlySameOriginHeader + coep_header +
+    `&uuid=${openee_token}`;
+
+  // The "other" window.
+  const other_token = token();
+  const other_url = same_origin + executor_path + `&uuid=${other_token}`;
+
+  t.add_cleanup(() => {
+    send(opener_token, "window.close()")
+    send(openee_token, "window.close()")
+    send(other_token, "window.close()")
+  })
+
+  // 1. Create the opener window.
+  let opener_window_proxy = window.open(opener_url);
+
+  // 2. The opener opens its openee and the other window.
+  send(opener_token, `
+    window.openee = window.open('${openee_url.replace(/,/g, '\\,')}');
+    window.other = window.open('${other_url}');
+  `);
+
+  // 3. Make sure the openee is loaded.
+  send(openee_token, `send("${this_window_token}", "Loaded");`);
+  assert_equals(await receive(this_window_token), "Loaded");
+
+  // 4. The "other" window attempts to access the openee though the opener.
+  send(other_token, `tryAccess(opener.openee);`);
+
+  // 4. Check a report sent to the openee.
+  let report =
+    await receiveReport(openee_report_token, "access-to-coop-page-from-other")
+  assert_not_equals(report, "timeout", "Report not received");
+  assert_equals(report.type, "coop");
+  assert_equals(report.url, openee_url.replace(/"/g, '%22'));
+  assert_equals(report.body.disposition, "reporting");
+  assert_equals(report.body.effectivePolicy, "same-origin-plus-coep");
+  assert_equals(report.body.property, "blur");
+  assert_source_location_missing(report);
+}, "access-to-coop-page-from-other (COOP-RO)");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html
index 245df0439ea..9cee9684565 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-four-reports.https.html
@@ -28,10 +28,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-allow-popups",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -42,10 +41,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -56,10 +54,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-allow-popups",
-            "navigationURI": `${location.origin}/`, // referrer
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": `${location.origin}/`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -70,10 +68,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": `${location.origin}/`, // referrer
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": `${location.origin}/`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html
index a9bd737c6dd..33aa08e2b6a 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-from-unsafe-none.https.html
@@ -28,10 +28,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.href}`, // previous documnent url
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`, // previous documnent url
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -53,10 +53,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html
index f66d19a239a..484152cfb1c 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin-report-to.https.html
@@ -29,10 +29,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -55,10 +54,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -69,10 +67,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.origin}/`, // referrer
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": `${location.origin}/`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html
index 25124ef3d5e..ff3649fd395 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/report-only-same-origin.https.html
@@ -29,10 +29,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": `${location.href}`,
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`,
+            "referrer": `${location.origin}/`,
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -55,10 +55,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": `${location.href}`,
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`,
+            "referrer": `${location.origin}/`,
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html
index b2e28db349e..dde4c40b38a 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-coop-navigated-popup.https.html
@@ -54,10 +54,9 @@ promise_test( async t => {
       "report": {
         "body": {
           "disposition": "enforce",
-          "documentURI": RegExp(`uuid=${noCoopToken}$`),
           "effectivePolicy": "unsafe-none",
-          "navigationURI": RegExp(`uuid=${coopToken}$`),
-          "type": "navigation-from-document"
+          "nextResponseURL": RegExp(`uuid=${coopToken}$`),
+          "type": "navigation-from-response"
         },
         "url": RegExp(`uuid=${noCoopToken}$`),
         "type": "coop"
@@ -68,10 +67,10 @@ promise_test( async t => {
       "report": {
         "body": {
           "disposition": "enforce",
-          "documentURI": RegExp(`uuid=${coopToken}$`),
           "effectivePolicy": "same-origin",
-          "navigationURI": RegExp(`uuid=${noCoopToken}$`),
-          "type": "navigation-to-document"
+          "previousResponseURL": RegExp(`uuid=${noCoopToken}$`),
+          "referrer": RegExp(`uuid=${noCoopToken}$`),
+          "type": "navigation-to-response"
         },
         "url": RegExp(`uuid=${coopToken}$`),
         "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html
index a8730b00cc6..576ab7d85be 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-allow-popups-report-to.https.html
@@ -28,10 +28,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-allow-popups",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -42,10 +41,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.href}`, // previous documnent url
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`, // previous documnent url
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -69,10 +68,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-allow-popups",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -83,10 +81,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-allow-popups",
-            "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
-            "type": "navigation-to-document"
+            "previousResponseURL": ``,
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -110,10 +108,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-allow-popups",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html
index 51957b4ac19..590ab3ff3f2 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-coep-report-to.https.html
@@ -38,10 +38,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next destination url
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next destination url
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -52,10 +51,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.href}`, // previous document url
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`, // previous document url
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -80,10 +79,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation url
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation url
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -94,10 +92,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
-            "type": "navigation-to-document"
+            "previousResponseURL": ``,
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -119,10 +117,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next destination url
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation url
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -144,10 +141,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next destination url
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // initial navigation url
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -158,10 +154,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "reporting",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
-            "type": "navigation-to-document"
+            "previousResponseURL": ``,
+            "referrer": `${location.origin}/`, // referrer (origin, as dictated by the referrer policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html
index 6d3c6b41df1..6c929b0f8c1 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin-report-to.https.html
@@ -40,10 +40,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL (equal to the next document url in that case)
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/,
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -54,10 +53,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": '', // referrer (empty due to the Referrer Policy)
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": '', // referrer (empty due to the Referrer Policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -80,10 +79,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/,
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/,
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -94,10 +92,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "unsafe-none",
-            "navigationURI": `${location.href}`,
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`,
+            "referrer": '', // referrer (empty due to the Referrer Policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -121,10 +119,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // Next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/,
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -135,10 +132,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin-plus-coep",
-            "navigationURI": `${location.href}`, // Previous document URL
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`,
+            "referrer": '', // referrer (empty due to the Referrer Policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -162,10 +159,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/,
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -176,10 +172,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "unsafe-none",
-            "navigationURI": '', // referrer, as per the no-referrer policy.
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": '', // referrer (empty due to the Referrer Policy)
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -203,10 +199,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "same-origin",
-            "navigationURI": /uuid=EXECUTOR_UUID$/,
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/,
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
index ec39a568bbd..2fa4e023893 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-same-origin.https.html
@@ -29,10 +29,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.href}`, // referrer
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": `${location.href}`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -56,10 +56,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "unsafe-none",
-            "navigationURI": `${location.href}`,
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`,
+            "referrer": `${location.href}`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -83,10 +83,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
-            "effectivePolicy": "unsafe-none",
-            "navigationURI": `${location.href}`, // referrer
-            "type": "navigation-to-document"
+            "previousResponseURL": "",
+            "referrer": `${location.href}`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
index a4eaec15bbe..05bb150d856 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-popup-unsafe-none-report-to.https.html
@@ -29,10 +29,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "unsafe-none",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -43,10 +42,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.href}`, // previous document url
-            "type": "navigation-to-document"
+            "previousResponseURL": `${location.href}`, // previous document url
+            "referrer": `${location.href}`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
@@ -71,10 +70,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "unsafe-none",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // next document URL
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -96,10 +94,9 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": `${location.href}`,
             "effectivePolicy": "unsafe-none",
-            "navigationURI": /uuid=EXECUTOR_UUID$/, // initial navigation url
-            "type": "navigation-from-document"
+            "nextResponseURL": /uuid=EXECUTOR_UUID$/, // next document URL
+            "type": "navigation-from-response"
           },
           "url": `${location.href}`,
           "type": "coop"
@@ -110,10 +107,10 @@ let tests = [
         "report": {
           "body": {
             "disposition": "enforce",
-            "documentURI": /uuid=EXECUTOR_UUID$/,
             "effectivePolicy": "same-origin",
-            "navigationURI": `${location.href}`, // referrer
-            "type": "navigation-to-document"
+            "previousResponseURL": ``,
+            "referrer": `${location.href}`, // referrer
+            "type": "navigation-to-response"
           },
           "url": /uuid=EXECUTOR_UUID$/,
           "type": "coop"
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html
index f2f06efd628..3b513371b02 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/navigation-reporting/reporting-redirect-with-same-origin-allow-popups.https.html
@@ -100,7 +100,7 @@ function redirect_test( popup_origin ) {
     // 5. Check a report sent to the openee.
     let report = await receiveReport(
         opener_report_token,
-        "navigation-to-document");
+        "navigation-to-response");
     assert_not_equals(report, "timeout", "Report not received");
     assert_equals(report.type, "coop");
     assert_equals(report.body.disposition, "enforce");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js
index ece74ab269d..3b1820cebb8 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/reporting/resources/reporting-common.js
@@ -17,8 +17,8 @@ function isCoopOpenerBreakageReport(report) {
   if (report.type != "coop")
     return false;
 
-  if (report.body.type != "navigation-from-document" &&
-      report.body.type != "navigation-to-document") {
+  if (report.body.type != "navigation-from-response" &&
+      report.body.type != "navigation-to-response") {
     return false;
   }
 
@@ -98,14 +98,19 @@ function replaceFromRegexOrString(str, match, value) {
 // EXECUTOR_UUID: the uuid generated with token().
 function replaceValuesInExpectedReport(expectedReport, executorUuid) {
   if (expectedReport.report.body !== undefined) {
-    if (expectedReport.report.body.documentURI !== undefined) {
-      expectedReport.report.body.documentURI = replaceFromRegexOrString(
-          expectedReport.report.body.documentURI, "EXECUTOR_UUID",
+    if (expectedReport.report.body.nextResponseURL !== undefined) {
+      expectedReport.report.body.nextResponseURL = replaceFromRegexOrString(
+          expectedReport.report.body.nextResponseURL, "EXECUTOR_UUID",
           executorUuid);
     }
-    if (expectedReport.report.body.navigationURI !== undefined) {
-      expectedReport.report.body.navigationURI = replaceFromRegexOrString(
-          expectedReport.report.body.navigationURI, "EXECUTOR_UUID",
+    if (expectedReport.report.body.previousResponseURL !== undefined) {
+      expectedReport.report.body.previousResponseURL = replaceFromRegexOrString(
+          expectedReport.report.body.previousResponseURL, "EXECUTOR_UUID",
+          executorUuid);
+    }
+    if (expectedReport.report.body.referrer !== undefined) {
+      expectedReport.report.body.referrer = replaceFromRegexOrString(
+          expectedReport.report.body.referrer, "EXECUTOR_UUID",
           executorUuid);
     }
   }
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resource-popup.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resource-popup.https.html
new file mode 100644
index 00000000000..481cceb72f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resource-popup.https.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>Cross-Origin-Opener-Policy forces browsing context switch in various popup document types</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+
+<p>These tests create a "parent" popup window which is an HTML document with a
+specific Cross-Origin-Opener-Policy. The parent creates a "child" popup window
+which is a non-HTML document with a Cross-Origin-Opener-Policy of its own. The
+parent waits for the child's location to change from "<code>about:blank</code>"
+and then inspects its <code>name</code> and <code>closed</code> properties
+which it reports back to the test context.</p>
+
+<p>The HTTP `Refresh` header is used to ensure the child eventually closes
+itself (since proper observance of COOP will prevent the parent from closing
+the child in some cases).</p>
+
+<script>
+'use strict';
+
+const coop_resource_test = ({parentCoop, resourceCoop, resource, resourceName, validate}) => {
+  async_test((t) => {
+    const bc = new BroadcastChannel(token());
+    bc.onmessage = t.step_func_done(({data}) => validate(data));
+    const childLocation = resource +
+      `?pipe=header(Refresh,2;url=/html/cross-origin-opener-policy/resources/resource-cleanup.html?channel=${bc.name})` +
+      (resourceCoop ? `|header(Cross-Origin-Opener-Policy,${resourceCoop})` : '');
+    const parentLocation = 'resources/resource-popup.html' +
+      `?channel_name=${bc.name}` +
+      `&resource=${encodeURIComponent(childLocation)}` +
+      `&resource_name=${resourceName}` +
+      (parentCoop ? `&pipe=header(Cross-Origin-Opener-Policy,${parentCoop})` : '');
+
+    open(parentLocation);
+
+    t.add_cleanup(() => {
+      // Close the "parent" popup and the "child" popup if it has already
+      // redirected to the HTML document.
+      bc.postMessage(null);
+      // Prepare to close the "child" popup in the case that it has not yet
+      // redirected to the the HTML document.
+      bc.onmessage = () => bc.postMessage(null);
+    });
+  }, `${resource} - parent COOP: "${parentCoop}"; child COOP: "${resourceCoop}"`);
+};
+
+const resources = [
+  '/common/dummy.xml',
+  '/images/red.png',
+  '/common/text-plain.txt',
+  '/media/2x2-green.mp4',
+];
+
+for (const resource of resources) {
+  coop_resource_test({
+    parentCoop: '',
+    resourceCoop: 'same-origin',
+    resource,
+    resourceName: 'foobar',
+    validate(data) {
+      assert_equals(data.name, null);
+      assert_equals(data.closed, true);
+    }
+  });
+
+  coop_resource_test({
+    parentCoop: 'same-origin',
+    resourceCoop: '',
+    resource,
+    resourceName: 'foobar',
+    validate(data) {
+      assert_equals(data.name, null);
+      assert_equals(data.closed, true);
+    }
+  });
+
+  coop_resource_test({
+    parentCoop: 'same-origin',
+    resourceCoop: 'same-origin',
+    resource,
+    resourceName: 'foobar',
+    validate(data) {
+      assert_equals(data.name, 'foobar');
+      assert_equals(data.closed, false);
+    }
+  });
+}
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js
index 8a3cd133734..18656cd9e6e 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/common.js
@@ -49,8 +49,16 @@ function url_test(t, url, channelName, hasOpener, openerDOMAccess, callback) {
   });
 }
 
+function percent_encode(objectOrString) {
+  if (typeof objectOrString === "object") {
+    return objectOrString.percentEncoded;
+  }
+  return encodeURIComponent(objectOrString);
+}
+
 function coop_coep_test(t, host, coop, coep, channelName, hasOpener, openerDOMAccess, callback) {
-  url_test(t, `${host.origin}/html/cross-origin-opener-policy/resources/coop-coep.py?coop=${encodeURIComponent(coop)}&coep=${coep}&channel=${channelName}`, channelName, hasOpener, openerDOMAccess, callback);
+  const coopPercentEncoded = percent_encode(coop);
+  url_test(t, `${host.origin}/html/cross-origin-opener-policy/resources/coop-coep.py?coop=${coopPercentEncoded}&coep=${coep}&channel=${encodeURIComponent(channelName)}`, channelName, hasOpener, openerDOMAccess, callback);
 }
 
 function coop_test(t, host, coop, channelName, hasOpener, callback) {
@@ -59,11 +67,12 @@ function coop_test(t, host, coop, channelName, hasOpener, callback) {
 
 function run_coop_tests(documentCOOPValueTitle, testArray) {
   for (const test of testArray) {
+    let coopName = typeof test[1] === "object" ? test[1].percentEncoded : test[1];
     async_test(t => {
       coop_test(t, test[0], test[1],
-                `${documentCOOPValueTitle}_to_${test[0].name}_${test[1].replace(/ /g,"-")}`,
+                `${documentCOOPValueTitle}_to_${test[0].name}_${coopName.replace(/ /g,"-")}`,
                 test[2], () => { t.done(); });
-    }, `${documentCOOPValueTitle} document opening popup to ${test[0].origin} with COOP: "${test[1]}"`);
+    }, `${documentCOOPValueTitle} document opening popup to ${test[0].origin} with COOP: ${format_value(coopName)}`);
   }
 }
 
@@ -91,5 +100,19 @@ function run_coop_test_iframe (documentTitle, iframe_origin, popup_origin, popup
               assert_equals(payload.name, expects_name? name:"", 'name');
       });
       document.body.append(frame);
-  }, `${documentTitle} with ${iframe_origin.name} iframe opening popup a ${popup_origin.name} with COOP: ${popup_coop}`);
-}
\ No newline at end of file
+  }, `${documentTitle} with ${iframe_origin.name} iframe opening popup a ${popup_origin.name} with COOP: ${format_value(popup_coop)}`);
+}
+
+// Wait until the page is fully loaded before navigating
+// so that it creates a history entry properly.
+function fullyLoaded() {
+  return new Promise((resolve, reject) => {
+    addEventListener('load', () => {
+      requestAnimationFrame(() => {
+        requestAnimationFrame(() => {
+          resolve();
+        });
+      });
+    });
+  });
+}
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-coep.py b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-coep.py
index e0a3d90050a..04b673bf2d9 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-coep.py
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-coep.py
@@ -1,16 +1,16 @@
 def main(request, response):
     coop = request.GET.first(b"coop")
-    coopReportOnly = request.GET.first(b"coop-report-only") if b"coop-report-only" in request.GET else b""
+    coopReportOnly = request.GET.first(b"coop-report-only", None)
     coep = request.GET.first(b"coep")
-    coepReportOnly = request.GET.first(b"coep-report-only") if b"coep-report-only" in request.GET else b""
+    coepReportOnly = request.GET.first(b"coep-report-only", None)
     redirect = request.GET.first(b"redirect", None)
     if coop != b"":
         response.headers.set(b"Cross-Origin-Opener-Policy", coop)
-    if coop != b"":
+    if coopReportOnly is not None:
         response.headers.set(b"Cross-Origin-Opener-Policy-Report-Only", coopReportOnly)
     if coep != b"":
         response.headers.set(b"Cross-Origin-Embedder-Policy", coep)
-    if coep != b"":
+    if coepReportOnly is not None:
         response.headers.set(b"Cross-Origin-Embedder-Policy-Report-Only", coepReportOnly)
     if b'cache' in request.GET:
         response.headers.set(b'Cache-Control', b'max-age=3600')
@@ -26,29 +26,19 @@ def main(request, response):
 <!doctype html>
 <meta charset=utf-8>
 <script src="/common/get-host-info.sub.js"></script>
-<body></body>
+<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
+<body>
 <script>
   const params = new URL(location).searchParams;
   const navHistory = params.get("navHistory");
   const avoidBackAndForth = params.get("avoidBackAndForth");
   const navigate = params.get("navigate");
-  // Need to wait until the page is fully loaded before navigating
-  // so that it creates a history entry properly.
-  const fullyLoaded = new Promise((resolve, reject) => {
-    addEventListener('load', () => {
-      requestAnimationFrame(() => {
-        requestAnimationFrame(() => {
-          resolve();
-        });
-      });
-    });
-  });
   if (navHistory !== null) {
-    fullyLoaded.then(() => {
+    fullyLoaded().then(() => {
       history.go(Number(navHistory));
     });
   } else if (navigate !== null && (history.length === 1 || !avoidBackAndForth)) {
-    fullyLoaded.then(() => {
+    fullyLoaded().then(() => {
       self.location = navigate;
     });
   } else {
@@ -70,8 +60,9 @@ def main(request, response):
       iframe.contentWindow.postMessage(payload, "*");
     };
     const channelName = new URL(location).searchParams.get("channel");
-    iframe.src = `${get_host_info().HTTPS_ORIGIN}/html/cross-origin-opener-policy/resources/postback.html?channel=${channelName}`;
+    iframe.src = `${get_host_info().HTTPS_ORIGIN}/html/cross-origin-opener-policy/resources/postback.html?channel=${encodeURIComponent(channelName)}`;
     document.body.appendChild(iframe);
   }
 </script>
+</body>
 """
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis
new file mode 100644
index 00000000000..082478e1599
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/coop-same-origin-repeated.asis
@@ -0,0 +1,24 @@
+HTTP/1.1 200 OK
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Opener-Policy: same-origin
+Server: BaseHTTP/0.3 Python/2.7.15+
+Date: Wed, 18 Dec 2019 00:47:08 GMT
+
+<!doctype html>
+<meta charset=utf-8>
+<script src="/common/get-host-info.sub.js"></script>
+<iframe></iframe>
+<script>
+  const navigate = new URL(location).searchParams.get("navigate");
+  if (navigate !== null) {
+    self.location = navigate;
+  } else {
+    const iframe = document.querySelector("iframe");
+    iframe.onload = () => {
+      const payload = { name: self.name, opener: !!self.opener };
+      iframe.contentWindow.postMessage(payload, "*");
+    };
+    const channelName = new URL(location).searchParams.get("channel");
+    iframe.src = `${get_host_info().HTTPS_ORIGIN}/html/cross-origin-opener-policy/resources/postback.html?channel=${channelName}`;
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/csp-sandbox.py b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/csp-sandbox.py
new file mode 100644
index 00000000000..ed415c431ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/csp-sandbox.py
@@ -0,0 +1,29 @@
+def main(request, response):
+    coop = request.GET.first(b"coop")
+    coep = request.GET.first(b"coep")
+    sandbox = request.GET.first(b"sandbox")
+    if coop != "":
+        response.headers.set(b"Cross-Origin-Opener-Policy", coop)
+    if coep != "":
+        response.headers.set(b"Cross-Origin-Embedder-Policy", coep)
+    response.headers.set(b"Content-Security-Policy", b"sandbox " + sandbox + b";")
+
+    # Open a popup to coop-coep.py with the same parameters (except sandbox)
+    response.content = b"""
+<!doctype html>
+<meta charset=utf-8>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/html/cross-origin-opener-policy/resources/common.js"></script>
+<script>
+  const params = new URL(location).searchParams;
+  params.delete("sandbox");
+  const navigate = params.get("navigate");
+  if (navigate) {
+    fullyLoaded().then(() => {
+      self.location = navigate;
+    });
+  } else {
+    window.open(`/html/cross-origin-opener-policy/resources/coop-coep.py?${params}`);
+  }
+</script>
+"""
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/javascript-url-same-origin.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/javascript-url-same-origin.https.html
new file mode 100644
index 00000000000..be2e59312b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/javascript-url-same-origin.https.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<script src="/common/get-host-info.sub.js"></script>
+<body>
+<script>
+'use strict';
+const params = new URLSearchParams(location.search);
+const childURL = JSON.stringify(encodeURIComponent(params.get('childURL')));
+const childName = JSON.stringify(params.get('childName'));
+location.assign(`javascript:\`<body><script>
+const child = window.open(${childURL}, ${childName});
+const bc = new BroadcastChannel(${childName});
+
+bc.addEventListener('message', ({data}) => {
+  if (data === 'close') {
+    close();
+    return;
+  }
+  if (data === 'inspectChild') {
+    const iframe = document.createElement('iframe');
+    iframe.onload = () => {
+      const payload = {
+        childClosed: child.closed
+      };
+      iframe.contentWindow.postMessage(payload, '*');
+    };
+    iframe.src = '${get_host_info().HTTPS_ORIGIN}/html/cross-origin-opener-policy/resources/postback.html?channel=${params.get('childName')}';
+    document.body.appendChild(iframe);
+  }
+});
+<\/script></body>\``);
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-cleanup.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-cleanup.html
new file mode 100644
index 00000000000..3ae5587c7d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-cleanup.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title>Redirect destination for non-HTML documents to close themselves</title>
+<script>
+'use strict';
+const channel = new URL(location).searchParams.get('channel');
+const bc = new BroadcastChannel(channel);
+bc.onmessage = () => close();
+bc.postMessage({name: 'FAIL', closed: 'FAIL' });
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-popup.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-popup.html
new file mode 100644
index 00000000000..f6b811407f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/resources/resource-popup.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+<title></title>
+<script>
+'use strict';
+const params = new URL(location).searchParams;
+const bc = new BroadcastChannel(params.get('channel_name'));
+const win = open(params.get('resource'), params.get('resource_name'));
+
+bc.onmessage = () => {
+  win.close();
+  close();
+};
+const id = setInterval(() => {
+  if (win.location.href !== 'about:blank') {
+    clearInterval(id);
+    bc.postMessage({name: win.name || null, closed: win.closed});
+  }
+}, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/dom/elements/images/bypass-cache-revalidation.html b/tests/wpt/web-platform-tests/html/dom/elements/images/bypass-cache-revalidation.html
new file mode 100644
index 00000000000..38cdd876da1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/elements/images/bypass-cache-revalidation.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Cached images can bypass revalidation</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<div id="imageDiv1"></div>
+<div id="imageDiv2"></div>
+<canvas id="canvas"></canvas>
+<script>
+
+function getImagePixel(image)
+{
+    canvas.getContext("2d").drawImage(image, 0, 0, 10, 10);
+    return canvas.getContext("2d").getImageData(0, 0, 1, 1).data;
+}
+
+let resolve;
+promise_test(async (t) => {
+   const url = "image.py?id=" + token();
+
+   let promise = new Promise(r => resolve = r);
+   imageDiv1.innerHTML = `<img src="${url}" onload="resolve()"></img>`;
+   await promise;
+
+   const url2 = "image.py?id=" + token();
+   promise = new Promise(r => resolve = r);
+   imageDiv1.innerHTML = `<img src="${url2}" onload="resolve()"></img>`;
+   await promise;
+
+   promise = new Promise(r => resolve = r);
+   imageDiv2.innerHTML = `<img id="image2" src="${url}" onload="resolve()"></img>`;
+   await promise;
+
+   assert_array_equals(getImagePixel(image2), [0, 255, 0, 255]);
+}, "Images can bypass no-cache");
+</script>
+
diff --git a/tests/wpt/web-platform-tests/html/dom/elements/images/image.py b/tests/wpt/web-platform-tests/html/dom/elements/images/image.py
new file mode 100644
index 00000000000..1aec0819263
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/elements/images/image.py
@@ -0,0 +1,28 @@
+import os.path
+
+from wptserve.utils import isomorphic_decode
+
+def main(request, response):
+
+    key = request.GET['id']
+    alreadyServedRequest = False
+    try:
+      alreadyServedRequest = request.server.stash.take(key)
+    except (KeyError, ValueError) as e:
+      pass
+
+    if alreadyServedRequest:
+      body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"../../../../images/red.png"), u"rb").read()
+    else:
+      request.server.stash.put(key, True);
+      body = open(os.path.join(os.path.dirname(isomorphic_decode(__file__)), u"../../../../images/green.png"), u"rb").read()
+      pass
+
+    response.writer.write_status(200)
+    response.writer.write_header(b"etag", "abcdef")
+    response.writer.write_header(b"content-length", len(body))
+    response.writer.write_header(b"content-type", "image/png")
+    response.writer.write_header(b"cache-control", "public, max-age=31536000, no-cache")
+    response.writer.end_headers()
+
+    response.writer.write(body)
diff --git a/tests/wpt/web-platform-tests/html/dom/idlharness.https.html b/tests/wpt/web-platform-tests/html/dom/idlharness.https.html
index 05b1f69ebb9..d79e09b46af 100644
--- a/tests/wpt/web-platform-tests/html/dom/idlharness.https.html
+++ b/tests/wpt/web-platform-tests/html/dom/idlharness.https.html
@@ -211,6 +211,7 @@ idl_test(
       PeerConnection: [],
       MediaStreamEvent: [],
       ErrorEvent: [],
+      EventSource: ['new EventSource("http://invalid")'],
       // https://web-platform-tests.org/writing-tests/server-features.html?tests-involving-multiple-origins
       WebSocket: ['new WebSocket("wss://nonexistent.' + get_host_info().ORIGINAL_HOST + '")'],
       CloseEvent: ['new CloseEvent("close")'],
@@ -226,6 +227,11 @@ idl_test(
       HTMLDirectoryElement: ['document.createElement("dir")'],
       HTMLFontElement: ['document.createElement("font")'],
       DOMStringList: ['location.ancestorOrigins'],
+      Storage: [
+        'localStorage',
+        'sessionStorage',
+      ],
+      StorageEvent: ['new StorageEvent("storage")']
     });
     idlArray.prevent_multiple_testing('HTMLElement');
     await waitForLoad;
diff --git a/tests/wpt/web-platform-tests/html/dom/idlharness.worker.js b/tests/wpt/web-platform-tests/html/dom/idlharness.worker.js
index feddaf54c92..872657d383c 100644
--- a/tests/wpt/web-platform-tests/html/dom/idlharness.worker.js
+++ b/tests/wpt/web-platform-tests/html/dom/idlharness.worker.js
@@ -11,7 +11,8 @@ idl_test(
     idlArray.add_objects({
       WorkerLocation: ['self.location'],
       WorkerNavigator: ['self.navigator'],
-      WebSocket: ['new WebSocket("ws://foo")'],
+      EventSource: ['new EventSource("http://invalid")'],
+      WebSocket: ['new WebSocket("ws://invalid")'],
       CloseEvent: ['new CloseEvent("close")'],
       Worker: [],
       MessageEvent: ['new MessageEvent("message", { data: 5 })'],
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index cac16d0b492..01c8a59cd2f 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -1,6 +1,34 @@
 // NOTE: this file needs to be split up rather than expanded. See ../location.sub.html for some
 // extracted tests. Tracked by https://github.com/web-platform-tests/wpt/issues/4934.
 
+/*
+* help:
+*   https://html.spec.whatwg.org/multipage/#the-link-element
+*   https://html.spec.whatwg.org/multipage/#styling
+*   https://html.spec.whatwg.org/multipage/#prepare-a-script
+*   https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm
+*   https://html.spec.whatwg.org/multipage/#track-url
+*   https://html.spec.whatwg.org/multipage/#concept-form-submit
+*   https://html.spec.whatwg.org/multipage/#set-the-frozen-base-url
+*   https://dom.spec.whatwg.org/#dom-node-baseuri
+*   https://html.spec.whatwg.org/multipage/#the-a-element
+*   https://html.spec.whatwg.org/multipage/#dom-worker
+*   https://html.spec.whatwg.org/multipage/#dom-sharedworker
+*   https://html.spec.whatwg.org/multipage/#dom-eventsource
+*   https://html.spec.whatwg.org/multipage/#dom-xmldocument-load
+*   https://html.spec.whatwg.org/multipage/#dom-open
+*   http://url.spec.whatwg.org/#dom-url-search
+*   https://www.w3.org/Bugs/Public/show_bug.cgi?id=24148
+*   https://xhr.spec.whatwg.org/#the-open()-method
+*   https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object
+*   https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts
+*   https://html.spec.whatwg.org/multipage/#parse-a-websocket-url's-components
+*   https://html.spec.whatwg.org/multipage/#dom-websocket-url
+*   https://html.spec.whatwg.org/multipage/#parse-a-manifest
+*   https://www.w3.org/Bugs/Public/show_bug.cgi?id=23968
+*   http://dev.w3.org/csswg/cssom/#requirements-on-user-agents-implementing-the-xml-stylesheet-processing-instruction
+*   http://url.spec.whatwg.org/#dom-url
+*/
 setup({explicit_done:true});
 onload = function() {
   var encoding = '{{GET[encoding]}}';
@@ -64,8 +92,7 @@ onload = function() {
         assert_equals(window[id].document.documentElement.textContent, expected_current);
       });
 
-    }, 'load nested browsing context <'+tag+' '+attr+'>',
-    {help:spec_url});
+    }, 'load nested browsing context <'+tag+' '+attr+'>');
   }
 
   spec_url_load_nested_browsing_context = {
@@ -94,9 +121,7 @@ onload = function() {
       assert_true(elm.sheet.href.indexOf(expected_current) > -1, 'sheet.href ' + msg(expected_current, got));
       assert_equals(elm.sheet.cssRules[0].style.content, '"'+expected_current+'"', 'sheet.cssRules[0].style.content');
     });
-  }, 'loading css <link>',
-  {help:['https://html.spec.whatwg.org/multipage/#the-link-element',
-         'https://html.spec.whatwg.org/multipage/#styling']});
+  }, 'loading css <link>');
 
   // loading js
   subsetTestByKey('loading-css', async_test, function() {
@@ -106,8 +131,7 @@ onload = function() {
     elm.onload = this.step_func_done(function() {
       assert_equals(window.test_load_js_got, expected_current);
     });
-  }, 'loading js <script>',
-  {help:'https://html.spec.whatwg.org/multipage/#prepare-a-script'});
+  }, 'loading js <script>');
 
   // loading image
   function test_load_image(tag, attr, spec_url) {
@@ -137,8 +161,7 @@ onload = function() {
       if (tag == 'video') {
         interval = setInterval(check_video_width, 10);
       }
-    }, 'loading image <'+tag+' '+attr+'>',
-    {help:spec_url});
+    }, 'loading image <'+tag+' '+attr+'>');
   }
 
   var query_to_image_width = {
@@ -203,8 +226,7 @@ onload = function() {
         var got = Math.round(elm.duration);
         assert_equals(got, query_to_video_duration[expected_current], msg(expected_current, video_duration_to_query[got]));
       });
-    }, 'loading video <'+tag+'>' + (use_source_element ? '<source>' : ''),
-    {help:'https://html.spec.whatwg.org/multipage/#concept-media-load-algorithm'});
+    }, 'loading video <'+tag+'>' + (use_source_element ? '<source>' : ''));
   }
 
   var query_to_video_duration = {
@@ -239,8 +261,7 @@ onload = function() {
       var got = track.track.cues[0].text;
       assert_equals(got, expected_current);
     });
-  }, 'loading webvtt <track>',
-  {help:'https://html.spec.whatwg.org/multipage/#track-url'});
+  }, 'loading webvtt <track>');
 
   // XXX downloading seems hard to automate
   // <a href download>
@@ -281,8 +302,7 @@ onload = function() {
         }
         assert_equals(got, expected_current);
       });
-    }, 'submit form <'+tag+' '+attr+'>',
-    {help:'https://html.spec.whatwg.org/multipage/#concept-form-submit'});
+    }, 'submit form <'+tag+' '+attr+'>');
   }
 
   'form action, input formaction, button formaction'.split(', ').forEach(function(str) {
@@ -307,10 +327,7 @@ onload = function() {
       var got_a_href = doc.links[0].href;
       assert_true(got_a_href.indexOf(expected_current) > -1, msg(expected_current, got_a_href), 'a.href');
     });
-  }, '<base href>',
-  {help:['https://html.spec.whatwg.org/multipage/#set-the-frozen-base-url',
-  'https://dom.spec.whatwg.org/#dom-node-baseuri',
-  'https://html.spec.whatwg.org/multipage/#the-a-element']});
+  }, '<base href>');
 
   // XXX drag and drop (<a href> or <img src>) seems hard to automate
 
@@ -320,8 +337,7 @@ onload = function() {
     worker.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_current);
     });
-  }, 'Worker constructor',
-  {help:'https://html.spec.whatwg.org/multipage/#dom-worker'});
+  }, 'Worker constructor');
 
   // SharedWorker()
   subsetTestByKey('workers', async_test, function() {
@@ -329,8 +345,7 @@ onload = function() {
     worker.port.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_current);
     });
-  }, 'SharedWorker constructor',
-  {help:'https://html.spec.whatwg.org/multipage/#dom-sharedworker'});
+  }, 'SharedWorker constructor');
 
   // EventSource()
   subsetTestByKey('eventsource', async_test, function() {
@@ -341,8 +356,7 @@ onload = function() {
     source.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_current);
     });
-  }, 'EventSource constructor',
-  {help:'https://html.spec.whatwg.org/multipage/#dom-eventsource'});
+  }, 'EventSource constructor');
 
   // EventSource#url
   subsetTestByKey('eventsource', test, function() {
@@ -350,8 +364,7 @@ onload = function() {
     source.close();
     var got = source.url;
     assert_true(source.url.indexOf(expected_current) > -1, msg(expected_current, got));
-  }, 'EventSource#url',
-  {help:'https://html.spec.whatwg.org/multipage/#dom-eventsource'});
+  }, 'EventSource#url');
 
   // window.open
   subsetTestByKey('window-open', async_test, function() {
@@ -370,8 +383,7 @@ onload = function() {
         this.done();
       }
     });
-  }, 'window.open()',
-  {help:'https://html.spec.whatwg.org/multipage/#dom-open'});
+  }, 'window.open()');
 
   // a.search, area.search
   function test_hyperlink_search(tag) {
@@ -384,9 +396,7 @@ onload = function() {
       assert_true(got_href.indexOf(expected_current) > -1, 'href content attribute ' + msg(expected_current, got_href));
       var got_search = elm.search;
       assert_true(got_search.indexOf(expected_current) > -1, 'getting .search '+msg(expected_current, got_search));
-    }, '<'+tag+'>.search',
-    {help:['https://html.spec.whatwg.org/multipage/#the-'+tag+'-element',
-           'http://url.spec.whatwg.org/#dom-url-search']});
+    }, '<'+tag+'>.search');
   }
   'a, area'.split(', ').forEach(function(str) {
     test_hyperlink_search(str);
@@ -408,8 +418,7 @@ onload = function() {
         assert_true(got.indexOf(expected_current) > -1, msg(expected_current, got));
         assert_equals(got.indexOf('/resources/resources/'), -1, 'url was resolved against the iframe\'s URL instead of the settings object\'s API base URL');
       });
-    }, 'history.'+prop,
-    {help:'https://html.spec.whatwg.org/multipage/#dom-history-'+prop.toLowerCase()});
+    }, 'history.'+prop);
   }
 
   'pushState, replaceState'.split(', ').forEach(function(str) {
@@ -461,8 +470,7 @@ onload = function() {
         document.body.removeChild(svg);
       });
       poll_for_stash(this, uuid, expected_current);
-    }, 'SVG <' + tag + '>',
-    {help:'https://www.w3.org/Bugs/Public/show_bug.cgi?id=24148'});
+    }, 'SVG <' + tag + '>');
   }
 
   [[function(svg, id) {
@@ -489,8 +497,7 @@ onload = function() {
       assert_equals(xhr.response, expected_utf8);
     });
     xhr.send();
-  }, 'XMLHttpRequest#open()',
-  {help:'https://xhr.spec.whatwg.org/#the-open()-method'});
+  }, 'XMLHttpRequest#open()');
 
   // in a worker
   subsetTestByKey('workers', async_test, function() {
@@ -498,54 +505,42 @@ onload = function() {
     worker.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'importScripts() in a dedicated worker',
-  {help:['https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object',
-         'https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts']});
+  }, 'importScripts() in a dedicated worker');
 
   subsetTestByKey('workers', async_test, function() {
     var worker = new Worker(input_url_worker_worker);
     worker.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'Worker() in a dedicated worker',
-  {help:['https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object',
-         'https://html.spec.whatwg.org/multipage/#dom-worker']});
+  }, 'Worker() in a dedicated worker');
 
   subsetTestByKey('workers', async_test, function() {
     var worker = new Worker(input_url_worker_sharedworker);
     worker.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'SharedWorker() in a dedicated worker',
-  {help:['https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object',
-         'https://html.spec.whatwg.org/multipage/#dom-sharedworker']});
+  }, 'SharedWorker() in a dedicated worker');
 
   subsetTestByKey('workers', async_test, function() {
     var worker = new SharedWorker(input_url_sharedworker_importScripts);
     worker.port.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'importScripts() in a shared worker',
-  {help:['https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object',
-         'https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-importscripts']});
+  }, 'importScripts() in a shared worker');
 
   subsetTestByKey('workers', async_test, function() {
     var worker = new SharedWorker(input_url_sharedworker_worker);
     worker.port.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'Worker() in a shared worker',
-  {help:['https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object',
-         'https://html.spec.whatwg.org/multipage/#dom-worker']});
+  }, 'Worker() in a shared worker');
 
   subsetTestByKey('workers', async_test, function() {
     var worker = new SharedWorker(input_url_sharedworker_sharedworker);
     worker.port.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'SharedWorker() in a shared worker',
-  {help:['https://html.spec.whatwg.org/multipage/#set-up-a-worker-script-settings-object',
-         'https://html.spec.whatwg.org/multipage/#dom-sharedworker']});
+  }, 'SharedWorker() in a shared worker');
 
   // WebSocket()
   subsetTestByKey('websocket', async_test, function() {
@@ -556,8 +551,7 @@ onload = function() {
     ws.onmessage = this.step_func_done(function(e) {
       assert_equals(e.data, expected_utf8);
     });
-  }, 'WebSocket constructor',
-  {help:'https://html.spec.whatwg.org/multipage/#parse-a-websocket-url\'s-components'});
+  }, 'WebSocket constructor');
 
   // WebSocket#url
   subsetTestByKey('websocket', test, function() {
@@ -565,8 +559,7 @@ onload = function() {
     ws.close();
     var got = ws.url;
     assert_true(ws.url.indexOf(expected_utf8) > -1, msg(expected_utf8, got));
-  }, 'WebSocket#url',
-  {help:'https://html.spec.whatwg.org/multipage/#dom-websocket-url'});
+  }, 'WebSocket#url');
 
   // Parsing cache manifest
   function test_cache_manifest(mode) {
@@ -579,8 +572,7 @@ onload = function() {
         document.body.removeChild(iframe);
       });
       poll_for_stash(this, uuid, expected_utf8);
-    }, 'Parsing cache manifest (' + mode + ')',
-    {help:'https://html.spec.whatwg.org/multipage/#parse-a-manifest'});
+    }, 'Parsing cache manifest (' + mode + ')');
   }
 
   'CACHE, FALLBACK, NETWORK'.split(', ').forEach(function(str) {
@@ -615,8 +607,7 @@ onload = function() {
         document.body.removeChild(div);
       });
       poll_for_stash(this, uuid, expected_utf8);
-    }, desc,
-    {help:'https://www.w3.org/Bugs/Public/show_bug.cgi?id=23968'});
+    }, desc);
   }
 
   // fail fast if the input doesn't parse into the expected cssom
@@ -672,8 +663,7 @@ onload = function() {
     iframe.onload = this.step_func_done(function() {
       assert_equals(iframe.contentDocument.firstChild.sheet.cssRules[0].style.content, '"' + expected_utf8 + '"');
     });
-  }, '<?xml-stylesheet?> (CSS)',
-  {help:'http://dev.w3.org/csswg/cssom/#requirements-on-user-agents-implementing-the-xml-stylesheet-processing-instruction'});
+  }, '<?xml-stylesheet?> (CSS)');
 
   // new URL()
   subsetTestByKey('url', test, function() {
@@ -681,16 +671,14 @@ onload = function() {
     var expected = expected_utf8;
     assert_true(url.href.indexOf(expected) > -1, 'url.href '+msg(expected, url.href));
     assert_true(url.search.indexOf(expected) > -1, 'url.search '+msg(expected, url.search));
-  }, 'URL constructor, url',
-  {help:'http://url.spec.whatwg.org/#dom-url'});
+  }, 'URL constructor, url');
 
   subsetTestByKey('url', test, function() {
     var url = new URL('', 'http://example.org/'+input_url);
     var expected = expected_utf8;
     assert_true(url.href.indexOf(expected) > -1, 'url.href '+msg(expected, url.href));
     assert_true(url.search.indexOf(expected) > -1, 'url.search '+msg(expected, url.search));
-  }, 'URL constructor, base',
-  {help:'http://url.spec.whatwg.org/#dom-url'});
+  }, 'URL constructor, base');
 
   // Test different schemes
   function test_scheme(url, utf8) {
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html
new file mode 100644
index 00000000000..c47c7cdd5d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+fieldset {
+  height: 200px;
+  overflow: scroll;
+  padding: 0;
+}
+
+.content {
+  height: 400px;
+}
+</style>
+
+<fieldset>
+  <legend>Legend</legend>
+  <div class="content"></div>
+</fieldset>
+
+<script>
+test(() => {
+  const fieldset = document.querySelector('fieldset');
+  assert_equals(getComputedStyle(fieldset)['overflow-x'], 'scroll');
+  assert_equals(getComputedStyle(fieldset)['overflow-y'], 'scroll');
+  assert_equals(fieldset.scrollHeight, 400);
+  fieldset.scrollTop = 500;
+  assert_greater_than_equal(fieldset.scrollTop, 200);
+}, 'Test cssom-view API for FIELDSET');
+</script>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html
new file mode 100644
index 00000000000..0e7f87232ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/multicol-legend-becomes-floated-crash.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1122722">
+<fieldset id="fieldset">
+  <legend id="legend"></legend>
+</fieldset>
+<script>
+  document.body.offsetTop;
+  fieldset.style.columns = "2";
+  legend.style.cssFloat = "left";
+</script>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html
new file mode 100644
index 00000000000..6e36b3bb5ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/second-legend-becomes-rendered-legend-crash.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1119400">
+<fieldset>
+  <legend id="legend1"></legend>
+  <legend id="legend2"><div id="child" style="float:left;"></div></legend>
+</fieldset>
+<script>
+  requestAnimationFrame(()=> {
+      requestAnimationFrame(()=> {
+          legend1.style.display = "none";
+          document.body.offsetTop;
+
+          child.style.width = "22px";
+          document.body.offsetTop;
+
+          child.style.display = "none";
+      });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/html/resources/common.js b/tests/wpt/web-platform-tests/html/resources/common.js
index 273f3a47be6..d23495ef8d1 100644
--- a/tests/wpt/web-platform-tests/html/resources/common.js
+++ b/tests/wpt/web-platform-tests/html/resources/common.js
@@ -113,7 +113,7 @@ function inContext(f) {
 // the context is passed to function as argument
 function testInIFrame(url, f, testName, testProps) {
     if (url) {
-        var t = async_test(testName, testProps);
+        var t = async_test(testName);
         t.step(function() {
             var context = newContext();
             var iframe = newIFrame(context, url);
@@ -130,7 +130,7 @@ function testInIFrame(url, f, testName, testProps) {
         test(inContext(function(context) {
             newRenderedHTMLDocument(context);
             f(context);
-        }), testName, testProps);
+        }), testName);
     }
 }
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html
new file mode 100644
index 00000000000..cd53914ecd5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/no-cuechange-before-play.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Ensure that the 'cuechange' event is not fired before video playback has begun.</title>
+<script src="/common/media.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+promise_test(function(t) {
+    let video = document.createElement('video');
+    video.src = getVideoURI('/media/movie_5');
+    video.preload = 'auto';
+
+    // Create a track element. The 'cuechange' event should not be fired.
+    let track = document.createElement('track');
+    track.oncuechange = t.unreached_func('The \`cuechange\` event should not be fired');
+
+    let videoWatcher = new EventWatcher(t, video, 'canplaythrough');
+    let trackWatcher = new EventWatcher(t, track, ['cuechange', 'load'])
+
+    track.src = 'resources/captions-fast.vtt';
+    track.kind = 'captions';
+    track.default = true;
+    track.track.mode = 'showing';
+    video.appendChild(track);
+
+    return Promise.all([videoWatcher.wait_for('canplaythrough'), trackWatcher.wait_for('load')]);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html
index 501cf3f92a2..a7c08a2e3ea 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-active-cues.html
@@ -26,7 +26,7 @@ async_test(function(t) {
     trackElement.oncuechange = t.step_func(eventCallback);
     video.oncanplaythrough = t.step_func(eventCallback);
 
-    video.onerror = t.step_func_done(function() {
+    video.onerror = t.step_func_done(function(event) {
         assert_equals(event.target, video);
         assert_not_equals(video.error, null);
         assert_equals(video.error.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED);
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html
new file mode 100644
index 00000000000..ab18cd24e44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<style>
+html { overflow: hidden; }
+#change {
+  will-change:transform;
+  width:200vw;
+  height:200vh;
+  position:absolute;
+  top: 0px;
+  left: 0px;
+}
+</style>
+<img id="change" src="image.png"></img>
+<div id="placeholder" style="position:relative">div</div>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html
new file mode 100644
index 00000000000..07c53cb2344
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-compositing-large-scale-change.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Composited images correctly display under large scale transform changes</title>
+<meta charset="utf-8">
+<link rel="match" href="image-compositing-large-scale-change-ref.html"/>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-img-element">
+<style>
+html { overflow: hidden; }
+#change {
+  will-change:transform;
+  width:1000px;
+  height:1000px;
+  position:absolute;
+  top: calc(50% - 5px);
+  left: calc(50% - 5px);
+}
+</style>
+<img id="change" src="image.png"></img>
+<div id="placeholder" style="position:relative"></div>
+<script>
+window.onload = () => {
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      let image = document.querySelector('#change');
+      image.style.transform = 'scale(20)';
+      placeholder.innerText = "div";
+
+      requestAnimationFrame(() => {
+        document.documentElement.classList.remove("reftest-wait");
+      });
+    });
+  });
+}
+</script>
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html
new file mode 100644
index 00000000000..db61db351ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/implicit-sizes-ignores-width.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<title>Implicit sizes ignores width</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+img {width: auto;}
+</style>
+<img srcset="../srcset/resources/image.png 100w" sizes="400px" id="sizes">
+<img srcset="../srcset/resources/image.png 100w" width="400" id="width">
+<script>
+setup({explicit_done:true});
+onload = () => {
+  test(() => {
+    assert_equals(document.getElementById("sizes").width, 400);
+    assert_equals(document.getElementById("width").width, window.innerWidth);
+    done();
+  });
+};
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime.html
index 52cb3c0697b..38ac00fbf0f 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/datetime.html
@@ -6,6 +6,13 @@
     <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
     <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
     <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-type">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-value">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-min">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-max">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-step">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-stepup">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-stepdown">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -24,80 +31,45 @@
     </div>
 
   <script type="text/javascript">
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].type, "date")}, "date type support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].value, "2011-12-01")}, "[date] The value must be a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].min, "2011-12-01")}, "[date] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].max, "2011-12-31")}, "[date] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].step, "5")}, "[date] The step attribute must be expressed in seconds", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[0].stepUp) == "function")}, "[date] stepUp method support on input 'date' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[0].stepDown) == "function")}, "[date] stepDown method support on input 'date' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].type, "date")}, "date type support on input element");
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].value, "2011-12-01")}, "[date] The value must be a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].min, "2011-12-01")}, "[date] The min attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].max, "2011-12-31")}, "[date] The max attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].step, "5")}, "[date] The step attribute must be expressed in seconds");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[0].stepUp) == "function")}, "[date] stepUp method support on input 'date' element");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[0].stepDown) == "function")}, "[date] stepDown method support on input 'date' element");
 
-    test(function() {assert_equals(document.getElementsByTagName("input")[1].type, "time")}, "[time] time type support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[1].value, "12:00")}, "[time] The value must be a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[1].min, "11:30")}, "[time] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[1].max, "14:00")}, "[time] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[1].step, "600")}, "[time] The step attribute must be expressed in seconds", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[1].stepUp) == "function")}, "[time] stepUp method support on input 'time' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[1].stepDown) == "function")}, "[time] stepDown method support on input 'time' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
+    test(function() {assert_equals(document.getElementsByTagName("input")[1].type, "time")}, "[time] time type support on input element");
+    test(function() {assert_equals(document.getElementsByTagName("input")[1].value, "12:00")}, "[time] The value must be a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[1].min, "11:30")}, "[time] The min attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[1].max, "14:00")}, "[time] The max attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[1].step, "600")}, "[time] The step attribute must be expressed in seconds");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[1].stepUp) == "function")}, "[time] stepUp method support on input 'time' element");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[1].stepDown) == "function")}, "[time] stepDown method support on input 'time' element");
 
-    test(function() {assert_equals(document.getElementsByTagName("input")[2].type, "datetime-local")}, "datetime-local type support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[2].value, "2011-12-01T12:00")}, "[datetime-local] The must be a valid local date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[2].min, "2011-12-01T12:00")}, "[datetime-local] The min attribute must have a value that is a valid local date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[2].max, "2011-12-31T22:00")}, "[datetime-local] The max attribute must have a value that is a valid local date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[2].step, "7200")}, "[datetime-local] The step attribute must be expressed in seconds", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[2].stepUp) == "function")}, "[datetime-local] stepUp method support on input 'datetime-local' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[2].stepDown) == "function")}, "[datetime-local] stepDown method support on input 'datetime-local' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
+    test(function() {assert_equals(document.getElementsByTagName("input")[2].type, "datetime-local")}, "datetime-local type support on input element");
+    test(function() {assert_equals(document.getElementsByTagName("input")[2].value, "2011-12-01T12:00")}, "[datetime-local] The must be a valid local date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[2].min, "2011-12-01T12:00")}, "[datetime-local] The min attribute must have a value that is a valid local date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[2].max, "2011-12-31T22:00")}, "[datetime-local] The max attribute must have a value that is a valid local date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[2].step, "7200")}, "[datetime-local] The step attribute must be expressed in seconds");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[2].stepUp) == "function")}, "[datetime-local] stepUp method support on input 'datetime-local' element");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[2].stepDown) == "function")}, "[datetime-local] stepDown method support on input 'datetime-local' element");
 
-    test(function() {assert_equals(document.getElementsByTagName("input")[3].type, "month")}, "month type support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[3].value, "2011-01")}, "[month] The value must be a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[3].min, "2011-01")}, "[month] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[3].max, "2011-12")}, "[month] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[3].step, "2")}, "[month] The step attribute must be expressed in seconds", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[3].stepUp) == "function")}, "[month] stepUp method support on input 'month' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[3].stepDown) == "function")}, "[month] stepDown method support on input 'month' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
+    test(function() {assert_equals(document.getElementsByTagName("input")[3].type, "month")}, "month type support on input element");
+    test(function() {assert_equals(document.getElementsByTagName("input")[3].value, "2011-01")}, "[month] The value must be a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[3].min, "2011-01")}, "[month] The min attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[3].max, "2011-12")}, "[month] The max attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[3].step, "2")}, "[month] The step attribute must be expressed in seconds");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[3].stepUp) == "function")}, "[month] stepUp method support on input 'month' element");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[3].stepDown) == "function")}, "[month] stepDown method support on input 'month' element");
 
-    test(function() {assert_equals(document.getElementsByTagName("input")[4].type, "week")}, "week type support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[4].value, "2011-W40")}, "[week] The value must be a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-value" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[4].min, "2011-W20")}, "[week] The min attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[4].max, "2011-W50")}, "[week] The max attribute must have a value that is a valid global date and time string", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[4].step, "2")}, "[week] The step attribute must be expressed in seconds", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-step" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[4].stepUp) == "function")}, "[week] stepUp method support on input 'week' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup" });
-    test(function() {assert_true(typeof(document.getElementsByTagName("input")[4].stepDown) == "function")}, "[week] stepDown method support on input 'week' element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown" });
+    test(function() {assert_equals(document.getElementsByTagName("input")[4].type, "week")}, "week type support on input element");
+    test(function() {assert_equals(document.getElementsByTagName("input")[4].value, "2011-W40")}, "[week] The value must be a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[4].min, "2011-W20")}, "[week] The min attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[4].max, "2011-W50")}, "[week] The max attribute must have a value that is a valid global date and time string");
+    test(function() {assert_equals(document.getElementsByTagName("input")[4].step, "2")}, "[week] The step attribute must be expressed in seconds");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[4].stepUp) == "function")}, "[week] stepUp method support on input 'week' element");
+    test(function() {assert_true(typeof(document.getElementsByTagName("input")[4].stepDown) == "function")}, "[week] stepDown method support on input 'week' element");
 
   </script>
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering-ref.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering-ref.html
deleted file mode 100644
index 5a396d3c52a..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering-ref.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<meta charset="utf-8">
-<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-
-<div>
-  email with leading whitespace: <input id=emailinput type=email>
-</div>
-<div>
-  number with trailing incomplete exponent: <input id=numberinput type=number>
-</div>
-
-<script>
-window.onload = async () => {
-  await test_driver.send_keys(emailinput, '  user');
-  await test_driver.send_keys(numberinput, '123e');
-
-  document.documentElement.classList.remove('reftest-wait');
-};
-</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html
index c65f6ff88c7..41ff967c190 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/defaultValue-clobbering.html
@@ -1,15 +1,14 @@
 <!DOCTYPE html>
-<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
-<link rel="match" href="defaultValue-clobbering-ref.html">
 <meta name="assert" content="Assigning to defaultValue does not modify text a user has already typed in.">
 
 <!-- This behavior is not explicitly specified. -->
 
+<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>
 
 <div>
   email with leading whitespace: <input id=emailinput type=email>
@@ -19,13 +18,19 @@
 </div>
 
 <script>
-window.onload = async () => {
+promise_test(async () => {
   await test_driver.send_keys(emailinput, '  user');
-  await test_driver.send_keys(numberinput, '123e');
+  assert_false(emailinput.validity.valid, '"  user" should not be a valid value for type=email.');
 
   emailinput.defaultValue = emailinput.value;
-  numberinput.defaultValue = numberinput.value;
+  assert_false(emailinput.validity.valid, 'Assigning to defaultValue should not affect input.validity.');
+}, 'Visible value and validity should not be affected when assigning to the defaultValue property for type=email.');
 
-  document.documentElement.classList.remove('reftest-wait');
-};
+promise_test(async () => {
+  await test_driver.send_keys(numberinput, '123e');
+  assert_false(numberinput.validity.valid, '"123e" should not be a valid value for type=number.');
+
+  numberinput.defaultValue = numberinput.value;
+  assert_false(numberinput.validity.valid, 'Assigning to defaultValue should not affect input.validity.');
+}, 'Visible value and validity should not be affected when assigning to the defaultValue property for type=number.');
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range.html
index 209ce25306e..577611bb802 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/range.html
@@ -8,6 +8,13 @@
     <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
     <link rel="author" title="Tomoyuki SHIMIZU" href="mailto:tomoyuki.labs@gmail.com">
     <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-type">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-min">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-max">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#range-state-(type=range)">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-stepup">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-stepdown">
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/#best-representation-of-the-number-as-a-floating-point-number">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -48,137 +55,91 @@
         function() {
           assert_equals(document.getElementById('range_basic').type, "range");
         },
-        "range type support on input element",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type"
-        }
+        "range type support on input element"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('range_basic').min, "0")
         },
-        "min attribute support on input element",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min"
-        }
+        "min attribute support on input element"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('range_basic').max, "5")
         },
-        "max attribute support on input element",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max"
-        }
+        "max attribute support on input element"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('illegal_min_and_max').min, "ab")
         },
-        "Illegal value of min attribute",
-        {
-          "help" : [
-            "https://html.spec.whatwg.org/multipage/#dom-input-min",
-            "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-          ]
-        }
+        "Illegal value of min attribute"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('illegal_min_and_max').max, "f")
         },
-        "Illegal value of max attribute",
-        {
-          "help" : [
-            "https://html.spec.whatwg.org/multipage/#dom-input-max",
-            "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-          ]
-        }
+        "Illegal value of max attribute"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('illegal_value_and_step').value, "3")
         },
-        "Converting an illegal string to the default value",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "Converting an illegal string to the default value"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('illegal_value_and_step').step, "xyz")
         },
-        "Illegal value of step attribute",
-        {
-          "help" : [
-            "https://html.spec.whatwg.org/multipage/#dom-input-step",
-            "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-          ]
-        }
+        "Illegal value of step attribute"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('value_smaller_than_min').value, "0")
         },
-        "the value is set to min when a smaller value than min attribute is given",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "the value is set to min when a smaller value than min attribute is given"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('value_larger_than_max').value, "5")
         },
-        "the value is set to max when a larger value than max attribute is given",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "the value is set to max when a larger value than max attribute is given"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('empty_attributes').min, "")
         },
-        "default value of min attribute in input type=range",
-        { "help" : "https://html.spec.whatwg.org/multipage/#dom-input-min" }
+        "default value of min attribute in input type=range"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('empty_attributes').max, "")
         },
-        "default value of max attribute in input type=range",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-max"
-        }
+        "default value of max attribute in input type=range"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('value_not_specified').value, "4")
         },
-        "default value when min and max attributes are given (= min plus half the difference between min and max)",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "default value when min and max attributes are given (= min plus half the difference between min and max)"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('control_step_mismatch').value, "4")
         },
-        "default value with step control when both min and max attributes are given",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "default value with step control when both min and max attributes are given"
       );
 
       // Chrome would result in different value out of the range between min and max. Why?
@@ -186,49 +147,35 @@
         function() {
           assert_equals(document.getElementById('max_smaller_than_min').value, "2")
         },
-        "default value when both min and max attributes are given, while min > max",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "default value when both min and max attributes are given, while min > max"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('default_step_scale_factor_1').value, "7")
         },
-        "The default step scale factor is 1, unless min attribute has non-integer value",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "The default step scale factor is 1, unless min attribute has non-integer value"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('default_step_scale_factor_2').value, "6.3")
         },
-        "Step scale factor behavior when min attribute has integer value but max attribute is non-integer ",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)" }
+        "Step scale factor behavior when min attribute has integer value but max attribute is non-integer "
       );
 
       test(
         function() {
           assert_equals(document.getElementById('default_step_scale_factor_3').step, "1")
         },
-        "The default scale factor is 1 even if step attribute is explicitly set to non-integer value, unless min attribute has non-integer value",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "The default scale factor is 1 even if step attribute is explicitly set to non-integer value, unless min attribute has non-integer value"
       );
 
       test(
         function() {
           assert_equals(document.getElementById('float_step_scale_factor').value, "6.8")
         },
-        "Solving the step mismatch",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#range-state-(type=range)"
-        }
+        "Solving the step mismatch"
       );
 
       // Firefox Nightly (24.0a1) would result in the possible maximum value in this range... (i.e. 12)
@@ -238,10 +185,7 @@
           e.stepUp();
           assert_equals(e.value, "9")
         },
-        "Performing stepUp()",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup"
-        }
+        "Performing stepUp()"
       );
 
       // Firefox Nightly (24.0a1) would result in the possible minimum value in this range... (i.e. 3)
@@ -251,10 +195,7 @@
           e.stepDown();
           assert_equals(e.value, "6")
         },
-        "Performing stepDown()",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown"
-        }
+        "Performing stepDown()"
       );
 
       // Chrome and Opera would throw DOM Exception 11 (InvalidStateError)
@@ -265,10 +206,7 @@
           e.stepUp(2);
           assert_equals(e.value, "12")
         },
-        "Performing stepUp() beyond the value of the max attribute",
-        {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepup"
-        }
+        "Performing stepUp() beyond the value of the max attribute"
       );
 
       // Chrome and Opera would throw DOM Exception 11 (InvalidStateError)
@@ -278,18 +216,14 @@
           var e = document.getElementById('stepdown_beyond_min');
           e.stepDown(2);
           assert_equals(e.value, "3")
-        }, "Performing stepDown() beyond the value of the min attribute", {
-          "help" : "https://html.spec.whatwg.org/multipage/#dom-input-stepdown"
-        }
+        }, "Performing stepDown() beyond the value of the min attribute"
       );
 
       test(
         function() {
           var e = document.getElementById('should_skip_whitespace');
           assert_equals(e.value, "123")
-        }, "Skip ASCII whitespace within input", {
-          "help" : "https://html.spec.whatwg.org/multipage/#best-representation-of-the-number-as-a-floating-point-number"
-        }
+        }, "Skip ASCII whitespace within input"
       );
 
       test(
@@ -297,9 +231,7 @@
           var e = document.getElementById('exponent_value1');
           e.value = 1e2;
           assert_equals(e.value, "100")
-        }, "Multiply value by ten raised to the exponentth power with `e`", {
-          "help" : "https://html.spec.whatwg.org/multipage/#best-representation-of-the-number-as-a-floating-point-number"
-        }
+        }, "Multiply value by ten raised to the exponentth power with `e`"
       );
 
       test(
@@ -307,9 +239,7 @@
           var e = document.getElementById('exponent_value2');
           e.value = 1E2;
           assert_equals(e.value, "100")
-        }, "Multiply value by ten raised to the exponentth power with `E`", {
-          "help" : "https://html.spec.whatwg.org/multipage/#best-representation-of-the-number-as-a-floating-point-number"
-        }
+        }, "Multiply value by ten raised to the exponentth power with `E`"
       );
 
     </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/search_input.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/search_input.html
index 175cdde99a3..7b63cd43e1b 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/search_input.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-input-element/search_input.html
@@ -6,7 +6,9 @@
      <meta name=viewport content="width=device-width, maximum-scale=1.0, user-scalable=no" />
      <link rel="author" title="Fabrice Clari" href="mailto:f.clari@inno-group.com">
      <link rel="author" title="Dimitri Bocquet" href="mailto:Dimitri.Bocquet@mosquito-fp7.eu">
-    <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
+     <link rel="help" href="https://html.spec.whatwg.org/multipage/#the-input-element">
+     <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-type">
+     <link rel="help" href="https://html.spec.whatwg.org/multipage/#dom-input-placeholder">
    <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -23,10 +25,8 @@
   <script type="text/javascript">
 
 
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].type, "search")}, "search type support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-type" });
-    test(function() {assert_equals(document.getElementsByTagName("input")[0].placeholder, "Search...")}, "placeholder attribute support on input element", {
-      "help" : "https://html.spec.whatwg.org/multipage/#dom-input-placeholder" });
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].type, "search")}, "search type support on input element");
+    test(function() {assert_equals(document.getElementsByTagName("input")[0].placeholder, "Search...")}, "placeholder attribute support on input element");
 
   </script>
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html
new file mode 100644
index 00000000000..2d9b19e0431
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>HTML LI element: implied scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <style>
+    body { margin-left: 40px }
+    li { list-style-type: decimal }
+  </style>
+</head>
+<body>
+<li start="1"></li>
+<li start="2"></li>
+<li start="3"></li>
+<li start="4"></li>
+<div><li></li></div>
+<div><div><li></li></div></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html
new file mode 100644
index 00000000000..2a7647fc2ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-004.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>HTML LI element: implied scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/grouping-content.html#the-li-element">
+  <link rel="help" href="https://drafts.csswg.org/css-lists/#propdef-counter-reset">
+  <link rel="match" href="grouping-li-reftest-004-ref.html">
+  <style>
+    body { margin-left: 40px }
+    li { list-style-type: decimal }
+  </style>
+</head>
+<body>
+<li></li>
+<li></li>
+<li></li>
+<li></li>
+<div><li></li></div>
+<div><div><li></li></div></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html
new file mode 100644
index 00000000000..6ec02e5433c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>HTML LI element: explicit scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+</head>
+<body>
+<ol>
+<li start="1"></li>
+<li start="2"></li>
+<li start="3"></li>
+<li start="4"></li>
+<div><li start="5"></li></div>
+<div><li start="6"></li></div>
+<div><div><li start="7"></li></div></div>
+</ol>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html
new file mode 100644
index 00000000000..2fa4e5dbe34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/grouping-content/the-li-element/grouping-li-reftest-005.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>HTML LI element: explicit scope</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.org">
+  <link rel="help" href="https://html.spec.whatwg.org/multipage/grouping-content.html#the-li-element">
+  <link rel="help" href="https://drafts.csswg.org/css-lists/#propdef-counter-reset">
+  <link rel="match" href="grouping-li-reftest-005-ref.html">
+</head>
+<body>
+<ol>
+<li></li>
+<li></li>
+<li></li>
+<li></li>
+<div><li></li></div>
+<div><li></li></div>
+<div><div><li></li></div></div>
+</ol>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker.mjs b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker.mjs
index 3d9c9bb7497..81c9d0bd3e9 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker.mjs
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/evaluation-order-2-import-worker.mjs
@@ -1,7 +1,7 @@
 globalThis.expectedLog = [
   "step-2.2-1", "step-2.2-2",
-  "microtask-2.2",
   "global-error", "error",
+  "microtask-2.2",
 ];
 
 done();
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html
index 8ad6532172c..caa1beab47a 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-template-element/template-element/template-as-a-descendant.html
@@ -72,15 +72,15 @@ var parameters = [['Template element as a descendant of the BODY element. ' +
                    'Template element is created by innerHTML',
                    doc.head],
                    ];
-generate_tests(templateIsAChild, parameters,
-        'Template element as a descendant of the HEAD and BODY elements');
+// Template element as a descendant of the HEAD and BODY elements
+generate_tests(templateIsAChild, parameters);
 
 parameters = [['Template element as a descendant of the FRAMESET element. ' +
                'Template element is created by innerHTML',
                frameset],
                ];
-generate_tests(templateIsDisallowedAsAChild, parameters,
-    'Template element should be disallowed as a descendant of the FRAMESET elements');
+// Template element should be disallowed as a descendant of the FRAMESET elements
+generate_tests(templateIsDisallowedAsAChild, parameters);
 
 
 parameters = [['Template element as an indirect descendant of the BODY element. ' +
@@ -90,15 +90,15 @@ parameters = [['Template element as an indirect descendant of the BODY element.
                'Template element is created by innerHTML',
                doc.head],
                ];
-generate_tests(templateIsAnIndirectChild, parameters,
-        'Template element as an indirect descendant of the HEAD, BODY and FRAMESET elements');
+// Template element as an indirect descendant of the HEAD, BODY and FRAMESET elements
+generate_tests(templateIsAnIndirectChild, parameters);
 
 parameters = [['Template element as an indirect descendant of the FRAMESET element. ' +
                'Template element is created by innerHTML',
                frameset],
                ];
-generate_tests(templateIsDisallowedAsAnIndirectChild, parameters,
-    'Template element should be disallowed as an indirect descendant of the FRAMESET elements');
+// Template element should be disallowed as an indirect descendant of the FRAMESET elements
+generate_tests(templateIsDisallowedAsAnIndirectChild, parameters);
 
 
 
@@ -112,8 +112,8 @@ parameters = [['Template element as a descendant of the BODY element. ' +
                 'Template element is  appended by appendChild()',
                 doc, frameset]
                ];
-generate_tests(templateIsAnAppendedChild, parameters,
-        'Template element as a descendant of the HEAD, BODY and FRAMESET elements');
+// Template element as a descendant of the HEAD, BODY and FRAMESET elements
+generate_tests(templateIsAnAppendedChild, parameters);
 
 
 
@@ -127,8 +127,8 @@ parameters = [['Template element as an indirect descendant of the BODY element.
                 'Template element is  appended by appendChild()',
                 doc, frameset]
                ];
-generate_tests(templateIsAnAppendedIndirectChild, parameters,
-        'Template element as a descendant of the HEAD, BODY and FRAMESET elements');
+// Template element as a descendant of the HEAD, BODY and FRAMESET elements
+generate_tests(templateIsAnAppendedIndirectChild, parameters);
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html b/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html
index a150faa1d7e..2e7d5408214 100644
--- a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html
+++ b/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-body-context.html
@@ -175,7 +175,8 @@ var parameters = [
      doc, 'tbody', '</tfoot>', null, null]
 ];
 
-generate_tests(doTest, parameters, 'Clearing stack back to a table body context.');
+// Clearing stack back to a table body context.
+generate_tests(doTest, parameters);
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html b/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html
index 23a4e7b0bbf..b805d3c9f99 100644
--- a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html
+++ b/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-context.html
@@ -77,7 +77,8 @@ var parameters = [
      doc, '<col id="col1" width="100%"/>', 'col1', 'COL']
 ];
 
-generate_tests(doTest, parameters, 'Clearing stack back to a table body context.');
+// Clearing stack back to a table body context.
+generate_tests(doTest, parameters);
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html b/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html
index 25039161261..d213c0fbddf 100644
--- a/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html
+++ b/tests/wpt/web-platform-tests/html/syntax/parsing/template/clearing-the-stack-back-to-a-given-context/clearing-stack-back-to-a-table-row-context.html
@@ -64,7 +64,8 @@ var parameters = [
       doc, '</tr>', null, null]
 ];
 
-generate_tests(doTest, parameters, 'Clearing stack back to a table body context.');
+// Clearing stack back to a table body context.
+generate_tests(doTest, parameters);
 
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html b/tests/wpt/web-platform-tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html
index bec3364adff..6738a6fde55 100644
--- a/tests/wpt/web-platform-tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html
+++ b/tests/wpt/web-platform-tests/html/syntax/parsing/template/creating-an-element-for-the-token/template-owner-document.html
@@ -171,9 +171,9 @@ function compare_owners(element, template) {
     assert_equals(element.ownerDocument, template.content.ownerDocument)
 }
 
-generate_tests(compare_owners, parameters,
-        'Test ownerDocument property of all HTML5 elements in a template. '
-            + 'Current DOCUMENT has no browsing context.');
+// Test ownerDocument property of all HTML5 elements in a template.
+// Current DOCUMENT has no browsing context.
+generate_tests(compare_owners, parameters);
 
 var context = newContext();
 parameters = [];
diff --git a/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js
new file mode 100644
index 00000000000..45570b35abf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/pageshow-event.window.js
@@ -0,0 +1,13 @@
+async_test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe"));
+  assert_equals(frame.contentDocument.open(), frame.contentDocument);
+  assert_equals(frame.contentDocument.documentElement, null);
+  frame.contentDocument.write("<div>heya</div>");
+  frame.contentDocument.close();
+  frame.contentWindow.addEventListener("pageshow", function() {
+    t.step(function() {
+      assert_true(true, "Got pageshow event");
+    });
+    t.done();
+  });
+}, "document.open(), and the pageshow events");
diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
index f4dca7d69d7..bb27ed704f5 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
@@ -140,8 +140,16 @@ test(() => {
   /* web+ prefixed schemes must be followed by 1+ ascii alphas */
   'web+',
   'web+1',
+  'web+namewithid123',
+  'web+namewithtrailingspace ',
+  'web+préfixewithaccent',     // é is not ascii alpha
+  'web+Kelvinsign',            // ASCII-lower KELVIN SIGN is not k
+  'web+latinsmallletterlongſ', // ASCII-lower LATIN SMALL LETTER LONG S is not s
   'web+dots.are.forbidden',
   'web+dashes-are-forbidden',
+  'web+underscores_are_forbidden',
+  'web+spaces are forbidden',
+  'web+non*alpha*are*forbidden',
   'web+digits123areforbidden',
 ].forEach(scheme => {
   test(() => {
@@ -191,6 +199,7 @@ test(() => {
   'WebCAL',
   'WTAI',
   'web+myprotocol',
+  'web+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', // all alphas
   'web+UpperCasedIsLowercased',
   'WEB+seeabove',
   'WeB+SeEaBoVe'
diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html
new file mode 100644
index 00000000000..0120aaa12ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.tentative.https.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset='utf-8'>
+<title>protocol handlers</title>
+
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+
+<script>
+// This should be merged into protocol.https.html when/if
+// https://github.com/whatwg/html/pull/5482 is approved.
+[
+  'cabal',
+  'dat',
+  'did',
+  'dweb',
+  'ethereum',
+  'hyper',
+  'ipfs',
+  'ipns',
+  'ssb',
+].forEach(scheme => {
+  test(() => {
+    navigator.registerProtocolHandler(scheme, location.href + '/%s', "foo");
+  }, 'registerProtocolHandler: overriding the "' + scheme + '" protocol should work');
+
+  test(() => {
+    navigator.unregisterProtocolHandler(scheme, location.href + '/%s');
+  }, 'unregisterProtocolHandler: overriding the "' + scheme + '" protocol should work');
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/idle-detection/idlharness.https.window.js b/tests/wpt/web-platform-tests/idle-detection/idlharness.https.window.js
index dec8fee9882..f2b32d8183b 100644
--- a/tests/wpt/web-platform-tests/idle-detection/idlharness.https.window.js
+++ b/tests/wpt/web-platform-tests/idle-detection/idlharness.https.window.js
@@ -7,31 +7,20 @@
 
 'use strict';
 
-promise_test(async (t) => {
-  await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
+idl_test(
+    ['idle-detection.tentative'],
+    ['dom', 'html'],
+    async (idl_array, t) => {
+      await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
 
-  const srcs = ['./idle-detection.idl',
-                '/interfaces/dom.idl',
-                '/interfaces/html.idl'];
+      self.idle = new IdleDetector();
+      let watcher = new EventWatcher(t, self.idle, ["change"]);
+      let initial_state = watcher.wait_for("change");
+      await self.idle.start();
+      await initial_state;
 
-  const [idle, dom, html] = await Promise.all(
-    srcs.map(i => fetch(i).then(r => r.text()))
-  );
-
-  const idl_array = new IdlArray();
-  idl_array.add_idls(idle);
-  idl_array.add_dependency_idls(dom);
-  idl_array.add_dependency_idls(html);
-
-  self.idle = new IdleDetector();
-  let watcher = new EventWatcher(t, self.idle, ["change"]);
-  let initial_state = watcher.wait_for("change");
-  await self.idle.start();
-  await initial_state;
-
-  idl_array.add_objects({
-    IdleDetector: ['idle'],
-  });
-
-  idl_array.test();
-}, 'Test IDL implementation of Idle Detection API');
+      idl_array.add_objects({
+        IdleDetector: ['idle'],
+      });
+    }
+);
diff --git a/tests/wpt/web-platform-tests/idle-detection/interceptor.https.html b/tests/wpt/web-platform-tests/idle-detection/interceptor.https.html
index 31acf2829f2..e597bd3e94e 100644
--- a/tests/wpt/web-platform-tests/idle-detection/interceptor.https.html
+++ b/tests/wpt/web-platform-tests/idle-detection/interceptor.https.html
@@ -3,18 +3,18 @@
 <title>Tests the Idle Detection API</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/test-only-api.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="/gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
-<script src="/gen/mojo/public/mojom/base/string16.mojom.js"></script>
-<script src="/gen/mojo/public/mojom/base/time.mojom.js"></script>
-<script src="/gen/third_party/blink/public/mojom/idle/idle_manager.mojom.js"></script>
-<script src="mock.js"></script>
+<script src="resources/idle-detection-helper.js"></script>
 <script>
 'use strict';
 
 promise_setup(async t => {
   await test_driver.set_permission({ name: 'notifications' }, 'granted', false);
+  if (isChromiumBased) {
+    await loadChromiumResources();
+  }
 })
 
 promise_test(async t => {
diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js b/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js
new file mode 100644
index 00000000000..5d085461835
--- /dev/null
+++ b/tests/wpt/web-platform-tests/idle-detection/resources/idle-detection-helper.js
@@ -0,0 +1,21 @@
+'use strict';
+
+// These tests rely on the User Agent providing an implementation of
+// platform nfc backends.
+//
+// In Chromium-based browsers this implementation is provided by a polyfill
+// in order to reduce the amount of test-only code shipped to users. To enable
+// these tests the browser must be run with these options:
+//
+//   --enable-blink-features=MojoJS,MojoJSTest
+
+async function loadChromiumResources() {
+  const chromiumResources = [
+    '/gen/mojo/public/mojom/base/string16.mojom.js',
+    '/gen/mojo/public/mojom/base/time.mojom.js',
+    '/gen/third_party/blink/public/mojom/idle/idle_manager.mojom.js'
+  ];
+
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/chromium/mock-idle-detection.js');
+}
diff --git a/tests/wpt/web-platform-tests/idle-detection/resources/idlharness-worker.js b/tests/wpt/web-platform-tests/idle-detection/resources/idlharness-worker.js
index 6527dc45525..ba2ddfe169c 100644
--- a/tests/wpt/web-platform-tests/idle-detection/resources/idlharness-worker.js
+++ b/tests/wpt/web-platform-tests/idle-detection/resources/idlharness-worker.js
@@ -4,7 +4,7 @@ importScripts("/resources/testharness.js");
 importScripts("/resources/WebIDLParser.js", "/resources/idlharness.js");
 
 idl_test(
-    ['../idle-detection/idle-detection'],
+    ['idle-detection.tentative'],
     ['dom', 'html'],
     async (idl_array, t) => {
       self.idle = new IdleDetector();
diff --git a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print-ref.html b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print-ref.html
index 71da5ffe1eb..5bc16469c81 100644
--- a/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print-ref.html
+++ b/tests/wpt/web-platform-tests/infrastructure/reftest/reftest_match-print-ref.html
@@ -2,7 +2,7 @@
 <meta name="reftest-pages" content="1-2">
 <style>
 * {margin: 0; padding:0}
-/* It is unclear to me why this is 180px rather than 192px (2 inches at 96dpi) */
+/* This should be 192px (2 inches at 96dpi), but the default margin on body reduces it to 180px */
 div {height:180px;}
 </style>
 <div>
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
index cf512269b07..11b1830efb9 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
@@ -9,17 +9,20 @@
 <div contenteditable></div>
 <script>
 const kBackspaceKey = "\uE003";
+const kArrowLeft =    "\uE012";
 const kShift =        "\uE008";
 const kMeta =         "\uE03d";
 const kControl =      "\uE009";
 const kAlt =          "\uE00A";
 
+const kImgSrc = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==";
+
 let selection = getSelection();
 let editor = document.querySelector("div[contenteditable]");
 let beforeinput = [];
 let input = [];
 editor.addEventListener("beforeinput", (e) => {
-  // NOTE: Blink makes `getTargetRanges()` return empty range after propagaion,
+  // NOTE: Blink makes `getTargetRanges()` return empty range after propagation,
   //       but this test wants to check the result during propagation.
   //       Therefore, we need to cache the result, but will assert if
   //       `getTargetRanges()` returns different ranges after checking the
@@ -101,6 +104,13 @@ function sendBackspaceKey(modifier) {
       .send();
 }
 
+function sendArrowLeftKey() {
+  return new test_driver.Actions()
+      .keyDown(kArrowLeft)
+      .keyUp(kArrowLeft)
+      .send();
+}
+
 function checkGetTargetRangesKeepReturningSameValue(event) {
   // https://github.com/w3c/input-events/issues/114
   assert_equals(getArrayOfRangesDescription(event.getTargetRanges()),
@@ -124,7 +134,7 @@ function checkGetTargetRangesOfBeforeinputOnDeleteSomething(expectedRange) {
     assert_equals(beforeinput[0].cachedRanges.length, 1,
         "beforeinput.getTargetRanges() should return one range within an array");
   }
-  assert_equals(beforeinput[0].cachedRanges, 1,
+  assert_equals(beforeinput[0].cachedRanges.length, 1,
       "One range should be returned from getTargetRanges() when the key operation deletes something");
   checkGetTargetRangesKeepReturningSameValue(beforeinput[0]);
 }
@@ -140,6 +150,11 @@ function checkGetTargetRangesOfInputOnDeleteSomething() {
   checkGetTargetRangesKeepReturningSameValue(input[0]);
 }
 
+function checkGetTargetRangesOfInputOnDoNothing() {
+  assert_equals(input.length, 0,
+      "input event shouldn't be fired when the key operation does not cause modifying the DOM tree");
+}
+
 function checkBeforeinputAndInputEventsOnNOOP() {
   assert_equals(beforeinput.length, 0,
       "beforeinput event shouldn't be fired when the key operation does not cause modifying the DOM tree");
@@ -160,7 +175,7 @@ promise_test(async () => {
     endContainer: editor.firstChild.firstChild,
     endOffset: 1,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>a[]bc</p>"');
 
 // Simply deletes the previous ASCII character of caret position.
@@ -176,7 +191,7 @@ promise_test(async () => {
     endContainer: editor.firstChild.firstChild,
     endOffset: 2,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>ab[]c</p>"');
 
 // Simply deletes the previous ASCII character of caret position.
@@ -192,10 +207,10 @@ promise_test(async () => {
     endContainer: editor.firstChild.firstChild,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc[]</p>"');
 
-// Should delete the `<span>` element becase it becomes empty.
+// Should delete the `<span>` element because it becomes empty.
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
@@ -212,10 +227,10 @@ promise_test(async () => {
     endContainer: c,
     endOffset: 0,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>a<span>b</span>[]c</p>"');
 
-// Should delete the `<span>` element becase it becomes empty.
+// Should delete the `<span>` element because it becomes empty.
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
@@ -232,7 +247,7 @@ promise_test(async () => {
     endContainer: editor.firstChild,
     endOffset: 2,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>a<span>b[]</span>c</p>"');
 
 // Invisible leading white-space may be deleted when the first visible
@@ -251,7 +266,7 @@ promise_test(async () => {
     endContainer: editor.firstChild.firstChild,
     endOffset: 2,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p> a[]bc</p>"');
 
 // Invisible leading white-spaces in current block and invisible trailing
@@ -275,7 +290,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   </p><p>   []def</p>"');
 
 // Invisible leading white-spaces in current block and invisible trailing
@@ -299,7 +314,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   </p><p>  [] def</p>"');
 
 // Invisible leading white-spaces in current block and invisible trailing
@@ -323,7 +338,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   </p><p> []  def</p>"');
 
 // Invisible leading white-spaces in current block and invisible trailing
@@ -347,7 +362,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   </p><p>[]   def</p>"');
 
 // Invisible leading white-spaces in current block and invisible trailing
@@ -371,7 +386,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   [</p><p>]   def</p>"');
 
 // Invisible leading white-spaces in the current block should be deleted
@@ -398,7 +413,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<pre>abc   </pre><p>   []def</p>"');
 
 // Invisible leading/trailing white-spaces in the current block should be
@@ -426,11 +441,11 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<pre>abc   </pre><p>   []def   </p>"');
 
 // Invisible trailing white-spaces in the first block should be deleted
-// when the block is joined with the preformated following block, but
+// when the block is joined with the preformatted following block, but
 // the leading white-spaces in the preformatted block shouldn't be
 // removed.  So, in this case, the invisible trailing white-spaces should
 // be in the range of `getTargetRanges()`, but not so for the preformatted
@@ -455,7 +470,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 0,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   </p><pre>[]   def</pre>"');
 
 // If the first block has invisible `<br>` element and joining it with
@@ -479,7 +494,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 0,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<br></p><p>[]def</p>"');
 
 // If the first block has invisible `<br>` element for empty last line and
@@ -503,7 +518,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 0,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<br><br></p><p>[]def</p>"');
 
 // Deleting visible `<br>` element should be contained by a range of
@@ -511,18 +526,246 @@ promise_test(async () => {
 promise_test(async () => {
   reset();
   editor.innerHTML = "<p>abc<br>def</p>";
+  let p = document.querySelector("p");
   let def = editor.querySelector("br").nextSibling;
   selection.collapse(def, 0);
   await sendBackspaceKey();
   assert_equals(editor.innerHTML, "<p>abcdef</p>");
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
-    startContainer: editor.firstChild,
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<br>[]def</p>"');
+
+// Deleting visible `<br>` element following white-space should not include
+// the preceding white-space in the range.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc <br>def</p>";
+  let p = editor.querySelector("p");
+  let def = editor.querySelector("br").nextSibling;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc <br>[]def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let def = p.lastChild;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abcdef</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<img>[]def</p>"');
+
+// White-spaces around `<img>` element are visible so that they shouldn't
+// be included into the target ranges.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc <img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let def = p.lastChild;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc <img>[]def</p>"');
+
+// White-spaces around `<img>` element are visible so that they shouldn't
+// be included into the target ranges.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}"> def</p>`;
+  let p = editor.querySelector("p");
+  let def = p.lastChild;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<img>[] def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  selection.collapse(p, 2);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<img>{}<img>def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let def = p.lastChild;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 2,
+    endContainer: p,
+    endOffset: 3,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<img><img>[]def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc<hr>def</div>`;
+  let div = editor.querySelector("div");
+  let hr = editor.querySelector("hr");
+  let def = hr.nextSibling;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
+    startOffset: 1,
+    endContainer: div,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<div>abc<hr>[]def</div>"');
+
+// White-spaces around block element are invisible white-spaces so that
+// they should be included into the target ranges to avoid they bcome
+// visible.
+// https://github.com/w3c/input-events/issues/112
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc <hr>def</div>`;
+  let div = editor.querySelector("div");
+  let abc = div.firstChild;
+  let hr = editor.querySelector("hr");
+  let def = hr.nextSibling;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: abc,
+    startOffset: 3,
+    endContainer: div,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<div>abc <hr>[]def</div>"');
+
+// White-spaces around block element are invisible white-spaces so that
+// they should be included into the target ranges to avoid they bcome
+// visible.
+// https://github.com/w3c/input-events/issues/112
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc<hr> def</div>`;
+  let div = editor.querySelector("div");
+  let hr = editor.querySelector("hr");
+  let def = hr.nextSibling;
+  selection.collapse(def, 1);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
     startOffset: 1,
     endContainer: def,
-    endOffset: 0,
+    endOffset: 1,
   });
-  checkGetTargetRangesOfInput();
-}, 'Backspace at "<p>abc<br>[]def</p>"');
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<div>abc<hr> []def</div>"');
+
+// Invisible `<br>` element immediately before `<hr>` element should be
+// deleted once, and both of them should be included in the target range.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc<br><hr>def</div>`;
+  let div = editor.querySelector("div");
+  let def = div.lastChild;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
+    startOffset: 1,
+    endContainer: div,
+    endOffset: 3,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<div>abc<br><hr>[]def</div>"');
+
+// Deleting visible `<br>` element followed by white-space should include
+// the following white-space in the range because it shouldn't become
+// visible and should be deleted for avoiding it.
+// https://github.com/w3c/input-events/issues/112
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc<br> def</p>";
+  let p = editor.querySelector("p");
+  let def = editor.querySelector("br").nextSibling;
+  selection.collapse(def, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abcdef</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: def,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<br>[] def</p>"');
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc<br> def</p>";
+  let p = editor.querySelector("p");
+  let def = editor.querySelector("br").nextSibling;
+  selection.collapse(def, 1);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abcdef</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: def,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<br> []def</p>"');
 
 // Deleting visible `<br>` element should be contained by a range of
 // `getTargetRanges()`.  However, when only the `<br>` element is selected,
@@ -540,7 +783,7 @@ promise_test(async () => {
     endContainer: editor.firstChild,
     endOffset: 2,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc{<br>}def</p>"');
 
 // Joining parent block and child block should remove invisible preceding
@@ -563,7 +806,7 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc   <p>   []def<br>ghi</p></div>"');
 
 // Joining child block and parent block should remove invisible trailing
@@ -585,9 +828,223 @@ promise_test(async () => {
     endContainer: def,
     endOffset: 3,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><p>abc   </p>   []def</div>"');
 
+// Backspace in empty paragraph should remove the empty paragraph.  In this
+// case, it should be treated as joining with the previous paragraph.
+// The target range should include the invisible <br> element in the empty
+// paragraph.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc</p><p><br></p>";
+  let p1 = editor.querySelector("p");
+  let abc = p1.firstChild;
+  let p2 = p1.nextSibling;
+  selection.collapse(p2, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: abc,
+    startOffset: 3,
+    endContainer: p2,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc</p><p>{}<br></p>');
+
+// Delete ignore the empty span and the other things must be same as the
+// previous test.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc</p><p><span></span><br></p>";
+  let p1 = editor.querySelector("p");
+  let abc = p1.firstChild;
+  let p2 = p1.nextSibling;
+  let span = p2.firstChild;
+  selection.collapse(span, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: abc,
+    startOffset: 3,
+    endContainer: p2,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc</p><p><span>{}</span><br></p>');
+
+// If invisible white-spaces are removed with same action as above tests,
+// the range should be included in the target ranges.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc  </p><p><br></p>";
+  let p1 = editor.querySelector("p");
+  let abc = p1.firstChild;
+  let p2 = p1.nextSibling;
+  selection.collapse(p2, 0);
+  await sendBackspaceKey();
+  assert_in_array(editor.innerHTML, ["<p>abc  </p>",
+                                     "<p>abc</p>"]);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: abc,
+    startOffset: abc.length,
+    endContainer: p2,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc  </p><p>{}<br></p>');
+
+// If the previous block ends with non-editable content, target range
+// should be after the non-editable content node.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc<span contenteditable=\"false\">def</span></p><p><br></p>";
+  let p1 = editor.querySelector("p");
+  let span = editor.querySelector("span");
+  let p2 = p1.nextSibling;
+  selection.collapse(p2, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc<span contenteditable=\"false\">def</span></p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p1,
+    startOffset: 2,
+    endContainer: p2,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc<span contenteditable="false">def</span></p><p>{}<br></p>"');
+
+// If previous non-editable paragraph is deleted, target range should begin
+// with end of the text node in the first paragraph.  Otherwise, start from
+// after the non-editable paragraph.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc</p><p contenteditable=\"false\">def</p><p><br></p>";
+  let p1 = editor.querySelector("p");
+  let abc = p1.firstChild;
+  let p2 = p1.nextSibling;
+  let p3 = p2.nextSibling;
+  selection.collapse(p3, 0);
+  await sendBackspaceKey();
+  assert_in_array(editor.innerHTML, ["<p>abc</p>",
+                                     "<p>abc</p><p contenteditable=\"false\">def</p>"]);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p2.isConnected ? editor : abc,
+    startOffset: p2.isConnected ? 2 : abc.length,
+    endContainer: p3,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<p>abc</p><p contenteditable=\"false\">def</p><p>{}<br></p>"');
+
+// If just removes the paragraph, target range should start from after the
+// table element.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<table><tr><td>cell</td></tr></table><p><br></p>";
+  let table = editor.querySelector("table");
+  let p = table.nextSibling;
+  selection.collapse(p, 0);
+  await sendBackspaceKey();
+  assert_in_array(editor.innerHTML, ["<table><tbody><tr><td>cell</td></tr></tbody></table>",
+                                     "<table><tbody><tr><td>cell</td></tr></tbody></table><p><br></p>"]);
+  if (p.isConnected) {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: p,
+      startOffset: 0,
+      endContainer: p,
+      endOffset: 0,
+    });
+    checkGetTargetRangesOfInputOnDoNothing();
+  } else {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: editor,
+      startOffset: 1,
+      endContainer: p,
+      endOffset: 1,
+    });
+    checkGetTargetRangesOfInputOnDeleteSomething();
+  }
+}, 'Backspace at "<table><tr><td>cell</td></tr></table><p>{}<br></p>"');
+
+// If table cell won't be joined, target range should be collapsed in the
+// cell.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<table><tr><td>cell1</td><td><br></td></tr></table>";
+  let cell1 = editor.querySelector("td");
+  let cell2 = cell1.nextSibling;
+  selection.collapse(cell2, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: cell2,
+    startOffset: 0,
+    endContainer: cell2,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDoNothing();
+}, 'Backspace at "<table><tr><td>cell1</td><td>{}<br></td></tr></table>"');
+
+// If table caption won't be deleted, target range should be collapsed in the
+// caption element.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc</p><table><caption><br></caption><tr><td>cell</td></tr></table>";
+  let caption = editor.querySelector("caption");
+  selection.collapse(caption, 0);
+  await sendBackspaceKey();
+  assert_equals(editor.innerHTML, "<p>abc</p><table><caption><br></caption><tbody><tr><td>cell</td></tr></tbody></table>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: caption,
+    startOffset: 0,
+    endContainer: caption,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDoNothing();
+}, 'Backspace at "<p>abc</p><table><caption>{}<br></caption><tr><td>cell</td></tr></table>"');
+
+// If caret is not adjacent of deleting character, browser may not delete the
+// character, but update the caret position for next deletion.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>&#x5E9;&#x5DC;&#x5D5;&#x5DD;hello</p>";
+  let text1 = editor.querySelector("p").firstChild;
+  let text2 = text1.nextSibling;
+  selection.collapse(text2 ? text2 : text1, text2 ? 1 : 5);
+  await sendArrowLeftKey();
+  await sendBackspaceKey();
+  assert_in_array(editor.innerHTML, ["<p>\u05E9\u05DC\u05D5\u05DDhello</p>",
+                                     "<p>\u05DC\u05D5\u05DDhello</p>",
+                                     "<p>\u05E9\u05DC\u05D5hello</p>"]);
+  if (editor.innerHTML === "<p>\u05E9\u05DC\u05D5\u05DDhello</p>") {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: text2 ? text2 : text1,
+      startOffset: text2 ? 0 : 4,
+      endContainer: text2 ? text2 : text1,
+      endOffset: text2 ? 0 : 4,
+    });
+    checkGetTargetRangesOfInputOnDoNothing();
+  } else if (editor.innerHTML === "<p>\u05DC\u05D5\u05DDhello</p>") {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: text1,
+      startOffset: 0,
+      endContainer: text1,
+      endOffset: 1,
+    });
+    checkGetTargetRangesOfInputOnDeleteSomething();
+  } else {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: text1,
+      startOffset: 3,
+      endContainer: text1,
+      endOffset: 4,
+    });
+    checkGetTargetRangesOfInputOnDeleteSomething();
+  }
+}, 'Backspace at "<p>&#x5E9;&#x5DC;&#x5D5;&#x5DD;[]hello</p>"');
+
 // The following tests check whether the range returned from
 // `beforeinput[0].getTargetRanges()` is modified or different range is
 // modified instead.  I.e., they don't test which type of deletion should
@@ -625,7 +1082,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Shift + Backspace at "<p>abc def[] ghi</p>"');
 
 promise_test(async () => {
@@ -649,7 +1106,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Control + Backspace at "<p>abc def[] ghi</p>"');
 
 promise_test(async () => {
@@ -673,7 +1130,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Alt + Backspace at "<p>abc def[] ghi</p>"');
 
 promise_test(async () => {
@@ -697,7 +1154,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Meta + Backspace at "<p>abc def[] ghi</p>"');
 
 promise_test(async () => {
@@ -724,7 +1181,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Shift + Backspace at "<p>   abc[] def</p>"');
 
 promise_test(async () => {
@@ -751,7 +1208,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Control + Backspace at "<p>   abc[] def</p>"');
 
 promise_test(async () => {
@@ -778,7 +1235,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Alt + Backspace at "<p>   abc[] def</p>"');
 
 promise_test(async () => {
@@ -805,7 +1262,7 @@ promise_test(async () => {
     endContainer: p.firstChild,
     endOffset: startOffset + length,
   });
-  checkGetTargetRangesOfInput();
+  checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Meta + Backspace at "<p>   abc[] def</p>"');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
index 3780324cf92..b31afacb62d 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
@@ -8,18 +8,21 @@
 <script src="/resources/testdriver-actions.js"></script>
 <div contenteditable></div>
 <script>
-const kDeleteKey = "\uE017";
-const kShift =     "\uE008";
-const kMeta =      "\uE03d";
-const kControl =   "\uE009";
-const kAlt =       "\uE00A";
+const kDeleteKey =  "\uE017";
+const kArrowRight = "\uE014";
+const kShift =      "\uE008";
+const kMeta =       "\uE03d";
+const kControl =    "\uE009";
+const kAlt =        "\uE00A";
+
+const kImgSrc = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEElEQVR42mNgaGD4D8YwBgAw9AX9Y9zBwwAAAABJRU5ErkJggg==";
 
 let selection = getSelection();
 let editor = document.querySelector("div[contenteditable]");
 let beforeinput = [];
 let input = [];
 editor.addEventListener("beforeinput", (e) => {
-  // NOTE: Blink makes `getTargetRanges()` return empty range after propagaion,
+  // NOTE: Blink makes `getTargetRanges()` return empty range after propagation,
   //       but this test wants to check the result during propagation.
   //       Therefore, we need to cache the result, but will assert if
   //       `getTargetRanges()` returns different ranges after checking the
@@ -101,6 +104,13 @@ function sendDeleteKey(modifier) {
       .send();
 }
 
+function sendArrowRightKey() {
+  return new test_driver.Actions()
+      .keyDown(kArrowRight)
+      .keyUp(kArrowRight)
+      .send();
+}
+
 function checkGetTargetRangesKeepReturningSameValue(event) {
   // https://github.com/w3c/input-events/issues/114
   assert_equals(getArrayOfRangesDescription(event.getTargetRanges()),
@@ -124,7 +134,7 @@ function checkGetTargetRangesOfBeforeinputOnDeleteSomething(expectedRange) {
     assert_equals(beforeinput[0].cachedRanges.length, 1,
         "beforeinput.getTargetRanges() should return one range within an array");
   }
-  assert_equals(beforeinput[0].cachedRanges, 1,
+  assert_equals(beforeinput[0].cachedRanges.length, 1,
       "One range should be returned from getTargetRanges() when the key operation deletes something");
   checkGetTargetRangesKeepReturningSameValue(beforeinput[0]);
 }
@@ -140,6 +150,11 @@ function checkGetTargetRangesOfInputOnDeleteSomething() {
   checkGetTargetRangesKeepReturningSameValue(input[0]);
 }
 
+function checkGetTargetRangesOfInputOnDoNothing() {
+  assert_equals(input.length, 0,
+      "input event shouldn't be fired when the key operation does not cause modifying the DOM tree");
+}
+
 function checkBeforeinputAndInputEventsOnNOOP() {
   assert_equals(beforeinput.length, 0,
       "beforeinput event shouldn't be fired when the key operation does not cause modifying the DOM tree");
@@ -195,7 +210,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>[]abc</p>"');
 
-// Should delete the `<span>` element becase it becomes empty.
+// Should delete the `<span>` element because it becomes empty.
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
@@ -215,7 +230,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>a[]<span>b</span>c</p>"');
 
-// Should delete the `<span>` element becase it becomes empty.
+// Should delete the `<span>` element because it becomes empty.
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
@@ -427,7 +442,7 @@ promise_test(async () => {
 }, 'Delete at "<pre>abc   []</pre><p>   def   </p>"');
 
 // Invisible trailing white-spaces in the first block should be deleted
-// when the block is joined with the preformated following block, but
+// when the block is joined with the preformatted following block, but
 // the leading white-spaces in the preformatted block shouldn't be
 // removed.  So, in this case, the invisible trailing white-spaces should
 // be in the range of `getTargetRanges()`, but not so for the preformatted
@@ -508,19 +523,61 @@ promise_test(async () => {
 promise_test(async () => {
   reset();
   editor.innerHTML = "<p>abc<br>def</p>";
-  let abc = editor.firstChild.firstChild;
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
   selection.collapse(abc, 3);
   await sendDeleteKey();
   assert_equals(editor.innerHTML, "<p>abcdef</p>");
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
-    startContainer: abc,
-    startOffset: 3,
-    endContainer: editor.querySelector("p"),
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
     endOffset: 2,
   });
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc[]<br>def</p>"');
 
+// Deleting visible `<br>` element following white-space should not include
+// the preceding white-space in the range.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc <br>def</p>";
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  selection.collapse(abc, 4);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abc def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc []<br>def</p>"');
+
+// Deleting visible `<br>` element followed by white-space should include
+// the following white-space in the range because it shouldn't become
+// visible and should be deleted for avoiding it.
+// https://github.com/w3c/input-events/issues/112
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>abc<br> def</p>";
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  let def = editor.querySelector("br").nextSibling;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abcdef</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: def,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc[]<br> def</p>"');
+
 // Deleting visible `<br>` element should be contained by a range of
 // `getTargetRanges()`.  However, when only the `<br>` element is selected,
 // the range shouldn't start from nor end by surrounding text nodes?
@@ -540,6 +597,172 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc{<br>}def</p>"');
 
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abcdef</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc[]<img>def</p>"');
+
+// White-spaces around `<img>` element are visible so that they shouldn't
+// be included into the target ranges.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc <img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  selection.collapse(abc, 4);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abc def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc []<img>def</p>"');
+
+// White-spaces around `<img>` element are visible so that they shouldn't
+// be included into the target ranges.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}"> def</p>`;
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abc def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc[]<img> def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  let abc = p.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 1,
+    endContainer: p,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc[]<img><img>def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`;
+  let p = editor.querySelector("p");
+  selection.collapse(p, 2);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p,
+    startOffset: 2,
+    endContainer: p,
+    endOffset: 3,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>abc<img>{}<img>def</p>"');
+
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc<hr>def</div>`;
+  let div = editor.querySelector("div");
+  let abc = div.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
+    startOffset: 1,
+    endContainer: div,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<div>abc[]<hr>def</div>"');
+
+// White-spaces around block element are invisible white-spaces so that
+// they should be included into the target ranges to avoid they become
+// visible.
+// https://github.com/w3c/input-events/issues/112
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc <hr>def</div>`;
+  let div = editor.querySelector("div");
+  let abc = div.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
+    startOffset: 1,
+    endContainer: div,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<div>abc[] <hr>def</div>"');
+
+// White-spaces around block element are invisible white-spaces so that
+// they should be included into the target ranges to avoid they become
+// visible.
+// https://github.com/w3c/input-events/issues/112
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc<hr> def</div>`;
+  let div = editor.querySelector("div");
+  let abc = div.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
+    startOffset: 1,
+    endContainer: div,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<div>abc[]<hr> def</div>"');
+
+// Invisible `<br>` element immediately before `<hr>` element should be
+// delete once, and both of them should be included in the target range.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = `<div>abc<br><hr>def</div>`;
+  let div = editor.querySelector("div");
+  let abc = div.firstChild;
+  selection.collapse(abc, 3);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<div>abcdef</div>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: div,
+    startOffset: 1,
+    endContainer: div,
+    endOffset: 3,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<div>abc[]<br><hr>def</div>"');
+
 // Joining parent block and child block should remove invisible preceding
 // white-spaces of the child block and invisible leading white-spaces in
 // the child block, and they should be contained in a range of
@@ -566,7 +789,7 @@ promise_test(async () => {
 // Joining child block and parent block should remove invisible trailing
 // white-spaces of the child block and invisible following white-spaces
 // in the parent block, and they should be contained by a range of
-// `getTaregetRanges()`, but maybe needs discussion.
+// `getTargetRanges()`, but maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
 promise_test(async () => {
   reset();
@@ -585,6 +808,219 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p>abc[]   </p>   def</div>"');
 
+// Delete in empty paragraph should remove the empty paragraph.  In this
+// case, it should be treated as joining with the previous paragraph.
+// The target range should include the invisible <br> element in the empty
+// paragraph.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p><br></p><p>abc</p>";
+  let p1 = editor.querySelector("p");
+  let p2 = p1.nextSibling;
+  let abc = p2.firstChild;
+  selection.collapse(p1, 0);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abc</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p1,
+    startOffset: 0,
+    endContainer: abc,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>{}<br></p><p>abc</p>');
+
+// Delete ignore the empty span and the other things must be same as the
+// previous test.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p><span></span><br></p><p>abc</p>";
+  let p1 = editor.querySelector("p");
+  let span = p1.firstChild;
+  let p2 = p1.nextSibling;
+  let abc = p2.firstChild;
+  selection.collapse(span, 0);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p>abc</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p1,
+    startOffset: 0,
+    endContainer: abc,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p><span>{}</span><br></p><p>abc</p>');
+
+// If invisible white-spaces are removed with same action as above tests,
+// the range should be included in the target ranges.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p><br></p><p>  abc</p>";
+  let p1 = editor.querySelector("p");
+  let p2 = p1.nextSibling;
+  let abc = p2.firstChild;
+  selection.collapse(p1, 0);
+  await sendDeleteKey();
+  assert_in_array(editor.innerHTML, ["<p>  abc</p>",
+                                     "<p>abc</p>"]);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p1,
+    startOffset: 0,
+    endContainer: abc,
+    endOffset: 5 - abc.length,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>{}<br></p><p>  abc</p>');
+
+// If the next block begins with non-editable content, target range
+// should be at the non-editable content node.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p><br></p><p><span contenteditable=\"false\">abc</span>def</p>";
+  let p1 = editor.querySelector("p");
+  let p2 = p1.nextSibling;
+  let span = editor.querySelector("span");
+  selection.collapse(p1, 0);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<p><span contenteditable=\"false\">abc</span>def</p>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p1,
+    startOffset: 0,
+    endContainer: p2,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>{}<br></p><p><span contenteditable="false">abc</span>def</p>"');
+
+// If next non-editable paragraph is deleted, target range should end
+// with start of the text node in the last paragraph.  Otherwise, ends at
+// the non-editable paragraph.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p><br></p><p contenteditable=\"false\">abc</p><p>def</p>";
+  let p1 = editor.querySelector("p");
+  let p2 = p1.nextSibling;
+  let p3 = p2.nextSibling;
+  let def = p3.firstChild;
+  selection.collapse(p3, 0);
+  await sendDeleteKey();
+  assert_in_array(editor.innerHTML, ["<p>def</p>",
+                                     "<p contenteditable=\"false\">abc</p><p>def</p>"]);
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: p1,
+    startOffset: 0,
+    endContainer: p2.isConnected ? editor : p3,
+    endOffset: p2.isConnected ? 1 : 0,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<p>{}<br></p><p contenteditable=\"false\">abc</p><p>def</p>"');
+
+// If just removes the paragraph, target range should end at the table element.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p><br></p><table><tr><td>cell</td></tr></table>";
+  let cell = editor.querySelector("td");
+  let p = editor.querySelector("p");
+  selection.collapse(p, 0);
+  await sendDeleteKey();
+  assert_in_array(editor.innerHTML, ["<table><tbody><tr><td>cell</td></tr></tbody></table>",
+                                     "<p><br></p><table><tbody><tr><td>cell</td></tr></tbody></table>"]);
+  if (p.isConnected) {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: p,
+      startOffset: 0,
+      endContainer: p,
+      endOffset: 0,
+    });
+    checkGetTargetRangesOfInputOnDoNothing();
+  } else {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: p,
+      startOffset: 0,
+      endContainer: editor,
+      endOffset: 1,
+    });
+    checkGetTargetRangesOfInputOnDeleteSomething();
+  }
+}, 'Delete at "<p>{}<br></p><table><tr><td>cell</td></tr></table>"');
+
+// If table cell won't be joined, target range should be collapsed in the
+// cell.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<table><tr><td><br></td><td>cell2</td></tr></table>";
+  let cell1 = editor.querySelector("td");
+  let cell2 = cell1.nextSibling;
+  selection.collapse(cell1, 0);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: cell1,
+    startOffset: 0,
+    endContainer: cell1,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDoNothing();
+}, 'Delete at "<table><tr><td>{}<br></td><td>cell2</td></tr></table>"');
+
+// If table caption won't be deleted, target range should be collapsed in the
+// caption element.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<table><caption><br></caption><tr><td>cell</td></tr></table>";
+  let caption = editor.querySelector("caption");
+  selection.collapse(caption, 0);
+  await sendDeleteKey();
+  assert_equals(editor.innerHTML, "<table><caption><br></caption><tbody><tr><td>cell</td></tr></tbody></table>");
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: caption,
+    startOffset: 0,
+    endContainer: caption,
+    endOffset: 0,
+  });
+  checkGetTargetRangesOfInputOnDoNothing();
+}, 'Delete at "<table><caption>{}<br></caption><tr><td>cell</td></tr></table>"');
+
+// If caret is not adjacent of deleting character, browser may not delete the
+// character, but update the caret position for next deletion.
+promise_test(async () => {
+  reset();
+  editor.innerHTML = "<p>hello&#x5E9;&#x5DC;&#x5D5;&#x5DD;</p>";
+  let text1 = editor.querySelector("p").firstChild;
+  let text2 = text1.nextSibling;
+  selection.collapse(text1, 4);
+  await sendArrowRightKey();
+  await sendDeleteKey();
+  assert_in_array(editor.innerHTML, ["<p>hello\u05E9\u05DC\u05D5\u05DD</p>",
+                                     "<p>hello\u05DC\u05D5\u05DD</p>",
+                                     "<p>hello\u05E9\u05DC\u05D5</p>"]);
+  if (editor.innerHTML === "<p>hello\u05E9\u05DC\u05D5\u05DD</p>") {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: text2 ? text2 : text1,
+      startOffset: text2 ? 0 : 5,
+      endContainer: text2 ? text2 : text1,
+      endOffset: text2 ? 0 : 5,
+    });
+    checkGetTargetRangesOfInputOnDoNothing();
+  } else if (editor.innerHTML === "<p>hello\u05DC\u05D5\u05DD</p>") {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: text2 ? text2: text1,
+      startOffset: text2 ? 0 : 5,
+      endContainer: text2 ? text2 : text1,
+      endOffset: text2 ? 1 : 6,
+    });
+    checkGetTargetRangesOfInputOnDeleteSomething();
+  } else {
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: text2 ? text2: text1,
+      startOffset: text2 ? 3 : 8,
+      endContainer: text2 ? text2 : text1,
+      endOffset: text2 ? 4 : 9,
+    });
+    checkGetTargetRangesOfInputOnDeleteSomething();
+  }
+}, 'Delete at "<p>hello[]&#x5E9;&#x5DC;&#x5D5;&#x5DD;</p>"');
+
 // The following tests check whether the range returned from
 // `beforeinput[0].getTargetRanges()` is modified or different range is
 // modified instead.  I.e., they don't test which type of deletion should
diff --git a/tests/wpt/web-platform-tests/interfaces/CSP.idl b/tests/wpt/web-platform-tests/interfaces/CSP.idl
index e427ae8801a..43ec3e4e87d 100644
--- a/tests/wpt/web-platform-tests/interfaces/CSP.idl
+++ b/tests/wpt/web-platform-tests/interfaces/CSP.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Content Security Policy Level 3 (https://w3c.github.io/webappsec-csp/)
 
 interface CSPViolationReportBody : ReportBody {
diff --git a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl b/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
index 5020be89942..99712629220 100644
--- a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: DOM Parsing and Serialization (https://w3c.github.io/DOM-Parsing/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/FileAPI.idl b/tests/wpt/web-platform-tests/interfaces/FileAPI.idl
index a630226c3df..aee0e65dcae 100644
--- a/tests/wpt/web-platform-tests/interfaces/FileAPI.idl
+++ b/tests/wpt/web-platform-tests/interfaces/FileAPI.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: File API (https://w3c.github.io/FileAPI/)
 
 [Exposed=(Window,Worker), Serializable]
@@ -54,12 +54,12 @@ interface FileList {
 interface FileReader: EventTarget {
   constructor();
   // async read methods
-  void readAsArrayBuffer(Blob blob);
-  void readAsBinaryString(Blob blob);
-  void readAsText(Blob blob, optional DOMString encoding);
-  void readAsDataURL(Blob blob);
+  undefined readAsArrayBuffer(Blob blob);
+  undefined readAsBinaryString(Blob blob);
+  undefined readAsText(Blob blob, optional DOMString encoding);
+  undefined readAsDataURL(Blob blob);
 
-  void abort();
+  undefined abort();
 
   // states
   const unsigned short EMPTY = 0;
@@ -96,5 +96,5 @@ interface FileReaderSync {
 [Exposed=(Window,DedicatedWorker,SharedWorker)]
 partial interface URL {
   static DOMString createObjectURL((Blob or MediaSource) obj);
-  static void revokeObjectURL(DOMString url);
+  static undefined revokeObjectURL(DOMString url);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/IndexedDB.idl b/tests/wpt/web-platform-tests/interfaces/IndexedDB.idl
index 8af2bbcf238..d82391da7e6 100644
--- a/tests/wpt/web-platform-tests/interfaces/IndexedDB.idl
+++ b/tests/wpt/web-platform-tests/interfaces/IndexedDB.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Indexed Database API 3.0 (https://w3c.github.io/IndexedDB/)
 
 [Exposed=(Window,Worker)]
@@ -69,12 +69,12 @@ interface IDBDatabase : EventTarget {
   [NewObject] IDBTransaction transaction((DOMString or sequence<DOMString>) storeNames,
                                          optional IDBTransactionMode mode = "readonly",
                                          optional IDBTransactionOptions options = {});
-  void close();
+  undefined close();
 
   [NewObject] IDBObjectStore createObjectStore(
     DOMString name,
     optional IDBObjectStoreParameters options = {});
-  void deleteObjectStore(DOMString name);
+  undefined deleteObjectStore(DOMString name);
 
   // Event handlers:
   attribute EventHandler onabort;
@@ -124,7 +124,7 @@ interface IDBObjectStore {
   [NewObject] IDBIndex createIndex(DOMString name,
                                    (DOMString or sequence<DOMString>) keyPath,
                                    optional IDBIndexParameters options = {});
-  void deleteIndex(DOMString name);
+  undefined deleteIndex(DOMString name);
 };
 
 dictionary IDBIndexParameters {
@@ -181,9 +181,9 @@ interface IDBCursor {
   readonly attribute any primaryKey;
   [SameObject] readonly attribute IDBRequest request;
 
-  void advance([EnforceRange] unsigned long count);
-  void continue(optional any key);
-  void continuePrimaryKey(any key, any primaryKey);
+  undefined advance([EnforceRange] unsigned long count);
+  undefined continue(optional any key);
+  undefined continuePrimaryKey(any key, any primaryKey);
 
   [NewObject] IDBRequest update(any value);
   [NewObject] IDBRequest delete();
@@ -210,8 +210,8 @@ interface IDBTransaction : EventTarget {
   readonly attribute DOMException? error;
 
   IDBObjectStore objectStore(DOMString name);
-  void commit();
-  void abort();
+  undefined commit();
+  undefined abort();
 
   // Event handlers:
   attribute EventHandler onabort;
diff --git a/tests/wpt/web-platform-tests/interfaces/SRI.idl b/tests/wpt/web-platform-tests/interfaces/SRI.idl
index 3abb66cd6e7..78f916fe64d 100644
--- a/tests/wpt/web-platform-tests/interfaces/SRI.idl
+++ b/tests/wpt/web-platform-tests/interfaces/SRI.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Subresource Integrity (https://w3c.github.io/webappsec-subresource-integrity/)
 
 partial interface HTMLLinkElement {
diff --git a/tests/wpt/web-platform-tests/interfaces/SVG.idl b/tests/wpt/web-platform-tests/interfaces/SVG.idl
index 63367fdc23e..f8d24c9c666 100644
--- a/tests/wpt/web-platform-tests/interfaces/SVG.idl
+++ b/tests/wpt/web-platform-tests/interfaces/SVG.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Scalable Vector Graphics (SVG) 2 (https://svgwg.org/svg2-draft/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl b/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl
index d81a43ba0f9..9e0aed0f4b0 100644
--- a/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl
+++ b/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Cryptography API (http://w3c.github.io/webcrypto/)
 
 partial interface mixin WindowOrWorkerGlobalScope {
diff --git a/tests/wpt/web-platform-tests/interfaces/WebIDL.idl b/tests/wpt/web-platform-tests/interfaces/WebIDL.idl
index a118dfd1a20..5179d167038 100644
--- a/tests/wpt/web-platform-tests/interfaces/WebIDL.idl
+++ b/tests/wpt/web-platform-tests/interfaces/WebIDL.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web IDL (https://heycam.github.io/webidl/)
 
 typedef (Int8Array or Int16Array or Int32Array or
@@ -45,4 +45,4 @@ interface DOMException { // but see below note about ECMAScript binding
 
 typedef unsigned long long DOMTimeStamp;
 callback Function = any (any... arguments);
-callback VoidFunction = void ();
+callback VoidFunction = undefined ();
diff --git a/tests/wpt/web-platform-tests/interfaces/accelerometer.idl b/tests/wpt/web-platform-tests/interfaces/accelerometer.idl
index f4187b60176..fc8fc07ff77 100644
--- a/tests/wpt/web-platform-tests/interfaces/accelerometer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/accelerometer.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Accelerometer (https://w3c.github.io/accelerometer/)
 
 [SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/ambient-light.idl b/tests/wpt/web-platform-tests/interfaces/ambient-light.idl
index 06d6eec690b..6d9c8e03eaa 100644
--- a/tests/wpt/web-platform-tests/interfaces/ambient-light.idl
+++ b/tests/wpt/web-platform-tests/interfaces/ambient-light.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Ambient Light Sensor (https://w3c.github.io/ambient-light/)
 
 [SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/anchors.idl b/tests/wpt/web-platform-tests/interfaces/anchors.idl
index 159bfaccd55..6c07b434bf2 100644
--- a/tests/wpt/web-platform-tests/interfaces/anchors.idl
+++ b/tests/wpt/web-platform-tests/interfaces/anchors.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebXR Anchors Module (https://immersive-web.github.io/anchors/)
 
 [SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
index 926a4fc2022..8d701371f85 100644
--- a/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
+++ b/tests/wpt/web-platform-tests/interfaces/appmanifest.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web App Manifest (https://w3c.github.io/manifest/)
 
 dictionary WebAppManifest {
diff --git a/tests/wpt/web-platform-tests/interfaces/audio-output.idl b/tests/wpt/web-platform-tests/interfaces/audio-output.idl
index 2041e6ea8fd..80ceb225308 100644
--- a/tests/wpt/web-platform-tests/interfaces/audio-output.idl
+++ b/tests/wpt/web-platform-tests/interfaces/audio-output.idl
@@ -1,13 +1,17 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Audio Output Devices API (https://w3c.github.io/mediacapture-output/)
 
 partial interface HTMLMediaElement {
   [SecureContext] readonly attribute DOMString sinkId;
-  [SecureContext] Promise<void> setSinkId (DOMString sinkId);
+  [SecureContext] Promise<undefined> setSinkId (DOMString sinkId);
 };
 
 partial interface MediaDevices {
-  Promise<MediaDeviceInfo> selectAudioOutput();
+  Promise<MediaDeviceInfo> selectAudioOutput(optional AudioOutputOptions options = {});
+};
+
+dictionary AudioOutputOptions {
+  DOMString deviceId = "";
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/background-fetch.idl b/tests/wpt/web-platform-tests/interfaces/background-fetch.idl
index cf3d7512540..1a0ed0e43cf 100644
--- a/tests/wpt/web-platform-tests/interfaces/background-fetch.idl
+++ b/tests/wpt/web-platform-tests/interfaces/background-fetch.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Background Fetch (https://wicg.github.io/background-fetch/)
 
 partial interface ServiceWorkerGlobalScope {
diff --git a/tests/wpt/web-platform-tests/interfaces/background-sync.idl b/tests/wpt/web-platform-tests/interfaces/background-sync.idl
index c52dcdb8984..12707e9289a 100644
--- a/tests/wpt/web-platform-tests/interfaces/background-sync.idl
+++ b/tests/wpt/web-platform-tests/interfaces/background-sync.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Background Synchronization (https://wicg.github.io/background-sync/spec/)
 
 partial interface ServiceWorkerRegistration {
diff --git a/tests/wpt/web-platform-tests/interfaces/badging.idl b/tests/wpt/web-platform-tests/interfaces/badging.idl
index 01481820935..0b011a92f00 100644
--- a/tests/wpt/web-platform-tests/interfaces/badging.idl
+++ b/tests/wpt/web-platform-tests/interfaces/badging.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Badging API (https://w3c.github.io/badging/)
 
 // Methods only exposed on documents.
diff --git a/tests/wpt/web-platform-tests/interfaces/battery-status.idl b/tests/wpt/web-platform-tests/interfaces/battery-status.idl
index 3f7a58b38be..dc85bff19e8 100644
--- a/tests/wpt/web-platform-tests/interfaces/battery-status.idl
+++ b/tests/wpt/web-platform-tests/interfaces/battery-status.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Battery Status API (https://w3c.github.io/battery/)
 
 partial interface Navigator {
diff --git a/tests/wpt/web-platform-tests/interfaces/beacon.idl b/tests/wpt/web-platform-tests/interfaces/beacon.idl
index c5e3465c59f..103a999fd43 100644
--- a/tests/wpt/web-platform-tests/interfaces/beacon.idl
+++ b/tests/wpt/web-platform-tests/interfaces/beacon.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Beacon (https://w3c.github.io/beacon/)
 
 partial interface Navigator {
diff --git a/tests/wpt/web-platform-tests/interfaces/clipboard-apis.idl b/tests/wpt/web-platform-tests/interfaces/clipboard-apis.idl
index c99113059ec..81926bdd6a1 100644
--- a/tests/wpt/web-platform-tests/interfaces/clipboard-apis.idl
+++ b/tests/wpt/web-platform-tests/interfaces/clipboard-apis.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Clipboard API and events (https://w3c.github.io/clipboard-apis/)
 
 dictionary ClipboardEventInit : EventInit {
@@ -22,8 +22,8 @@ typedef sequence<ClipboardItem> ClipboardItems;
 [SecureContext, Exposed=Window] interface Clipboard : EventTarget {
   Promise<ClipboardItems> read();
   Promise<DOMString> readText();
-  Promise<void> write(ClipboardItems data);
-  Promise<void> writeText(DOMString data);
+  Promise<undefined> write(ClipboardItems data);
+  Promise<undefined> writeText(DOMString data);
 };
 
 typedef (DOMString or Blob) ClipboardItemDataType;
diff --git a/tests/wpt/web-platform-tests/interfaces/compat.idl b/tests/wpt/web-platform-tests/interfaces/compat.idl
index fe77a2f9428..8106c2d4e05 100644
--- a/tests/wpt/web-platform-tests/interfaces/compat.idl
+++ b/tests/wpt/web-platform-tests/interfaces/compat.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Compatibility Standard (https://compat.spec.whatwg.org/)
 
 partial interface Window {
diff --git a/tests/wpt/web-platform-tests/interfaces/compression.idl b/tests/wpt/web-platform-tests/interfaces/compression.idl
index 47d2b9e48d0..d0cd635f2de 100644
--- a/tests/wpt/web-platform-tests/interfaces/compression.idl
+++ b/tests/wpt/web-platform-tests/interfaces/compression.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Compression Streams (https://wicg.github.io/compression/)
 
 interface mixin GenericTransformStream {
diff --git a/tests/wpt/web-platform-tests/interfaces/console.idl b/tests/wpt/web-platform-tests/interfaces/console.idl
index 3cd3c06b54b..7cd73a61764 100644
--- a/tests/wpt/web-platform-tests/interfaces/console.idl
+++ b/tests/wpt/web-platform-tests/interfaces/console.idl
@@ -1,34 +1,34 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Console Standard (https://console.spec.whatwg.org/)
 
 [Exposed=(Window,Worker,Worklet)]
 namespace console { // but see namespace object requirements below
   // Logging
-  void assert(optional boolean condition = false, any... data);
-  void clear();
-  void debug(any... data);
-  void error(any... data);
-  void info(any... data);
-  void log(any... data);
-  void table(optional any tabularData, optional sequence<DOMString> properties);
-  void trace(any... data);
-  void warn(any... data);
-  void dir(optional any item, optional object? options);
-  void dirxml(any... data);
+  undefined assert(optional boolean condition = false, any... data);
+  undefined clear();
+  undefined debug(any... data);
+  undefined error(any... data);
+  undefined info(any... data);
+  undefined log(any... data);
+  undefined table(optional any tabularData, optional sequence<DOMString> properties);
+  undefined trace(any... data);
+  undefined warn(any... data);
+  undefined dir(optional any item, optional object? options);
+  undefined dirxml(any... data);
 
   // Counting
-  void count(optional DOMString label = "default");
-  void countReset(optional DOMString label = "default");
+  undefined count(optional DOMString label = "default");
+  undefined countReset(optional DOMString label = "default");
 
   // Grouping
-  void group(any... data);
-  void groupCollapsed(any... data);
-  void groupEnd();
+  undefined group(any... data);
+  undefined groupCollapsed(any... data);
+  undefined groupEnd();
 
   // Timing
-  void time(optional DOMString label = "default");
-  void timeLog(optional DOMString label = "default", any... data);
-  void timeEnd(optional DOMString label = "default");
+  undefined time(optional DOMString label = "default");
+  undefined timeLog(optional DOMString label = "default", any... data);
+  undefined timeEnd(optional DOMString label = "default");
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/construct-stylesheets.idl b/tests/wpt/web-platform-tests/interfaces/construct-stylesheets.idl
index 35121866f66..7b65cb98bdd 100644
--- a/tests/wpt/web-platform-tests/interfaces/construct-stylesheets.idl
+++ b/tests/wpt/web-platform-tests/interfaces/construct-stylesheets.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Constructable Stylesheet Objects (https://wicg.github.io/construct-stylesheets/)
 
 partial interface CSSStyleSheet {
diff --git a/tests/wpt/web-platform-tests/interfaces/content-index.idl b/tests/wpt/web-platform-tests/interfaces/content-index.idl
index 5b4a8ead16c..4cd44f536d7 100644
--- a/tests/wpt/web-platform-tests/interfaces/content-index.idl
+++ b/tests/wpt/web-platform-tests/interfaces/content-index.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Content Index (https://wicg.github.io/content-index/spec/)
 
 partial interface ServiceWorkerGlobalScope {
diff --git a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl b/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
index bc2899bb4fc..cb59e74b93a 100644
--- a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Cookie Store API (https://wicg.github.io/cookie-store/)
 
 [Exposed=(ServiceWorker,Window),
@@ -12,25 +12,19 @@ interface CookieStore : EventTarget {
   Promise<CookieList> getAll(USVString name);
   Promise<CookieList> getAll(optional CookieStoreGetOptions options = {});
 
-  Promise<void> set(USVString name, USVString value);
-  Promise<void> set(CookieInit options);
+  Promise<undefined> set(USVString name, USVString value);
+  Promise<undefined> set(CookieInit options);
 
-  Promise<void> delete(USVString name);
-  Promise<void> delete(CookieStoreDeleteOptions options);
+  Promise<undefined> delete(USVString name);
+  Promise<undefined> delete(CookieStoreDeleteOptions options);
 
   [Exposed=Window]
   attribute EventHandler onchange;
 };
 
-enum CookieMatchType {
-  "equals",
-  "starts-with"
-};
-
 dictionary CookieStoreGetOptions {
   USVString name;
   USVString url;
-  CookieMatchType matchType = "equals";
 };
 
 enum CookieSameSite {
@@ -69,9 +63,9 @@ typedef sequence<CookieListItem> CookieList;
 [Exposed=(ServiceWorker,Window),
  SecureContext]
 interface CookieStoreManager {
-  Promise<void> subscribe(sequence<CookieStoreGetOptions> subscriptions);
+  Promise<undefined> subscribe(sequence<CookieStoreGetOptions> subscriptions);
   Promise<sequence<CookieStoreGetOptions>> getSubscriptions();
-  Promise<void> unsubscribe(sequence<CookieStoreGetOptions> subscriptions);
+  Promise<undefined> unsubscribe(sequence<CookieStoreGetOptions> subscriptions);
 };
 
 [Exposed=(ServiceWorker,Window)]
@@ -83,8 +77,8 @@ partial interface ServiceWorkerRegistration {
  SecureContext]
 interface CookieChangeEvent : Event {
   constructor(DOMString type, optional CookieChangeEventInit eventInitDict = {});
-  readonly attribute CookieList changed;
-  readonly attribute CookieList deleted;
+  [SameObject] readonly attribute FrozenArray<CookieListItem> changed;
+  [SameObject] readonly attribute FrozenArray<CookieListItem> deleted;
 };
 
 dictionary CookieChangeEventInit : EventInit {
@@ -95,8 +89,8 @@ dictionary CookieChangeEventInit : EventInit {
 [Exposed=ServiceWorker]
 interface ExtendableCookieChangeEvent : ExtendableEvent {
   constructor(DOMString type, optional ExtendableCookieChangeEventInit eventInitDict = {});
-  readonly attribute CookieList changed;
-  readonly attribute CookieList deleted;
+  [SameObject] readonly attribute FrozenArray<CookieListItem> changed;
+  [SameObject] readonly attribute FrozenArray<CookieListItem> deleted;
 };
 
 dictionary ExtendableCookieChangeEventInit : ExtendableEventInit {
@@ -106,11 +100,11 @@ dictionary ExtendableCookieChangeEventInit : ExtendableEventInit {
 
 [SecureContext]
 partial interface Window {
-  [Replaceable, SameObject] readonly attribute CookieStore cookieStore;
+  [SameObject] readonly attribute CookieStore cookieStore;
 };
 
 partial interface ServiceWorkerGlobalScope {
-  [Replaceable, SameObject] readonly attribute CookieStore cookieStore;
+  [SameObject] readonly attribute CookieStore cookieStore;
 
   attribute EventHandler oncookiechange;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl b/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
index 6b3954fdedf..083b6c3d630 100644
--- a/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cors-rfc1918.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CORS and RFC1918 (https://wicg.github.io/cors-rfc1918/)
 
 enum AddressSpace { "local", "private", "public" };
diff --git a/tests/wpt/web-platform-tests/interfaces/credential-management.idl b/tests/wpt/web-platform-tests/interfaces/credential-management.idl
index d097dd084b6..a2b062a7ffd 100644
--- a/tests/wpt/web-platform-tests/interfaces/credential-management.idl
+++ b/tests/wpt/web-platform-tests/interfaces/credential-management.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Credential Management Level 1 (https://w3c.github.io/webappsec-credential-management/)
 
 [Exposed=Window, SecureContext]
diff --git a/tests/wpt/web-platform-tests/interfaces/csp-embedded-enforcement.idl b/tests/wpt/web-platform-tests/interfaces/csp-embedded-enforcement.idl
index 167bc96eb53..a980630bc18 100644
--- a/tests/wpt/web-platform-tests/interfaces/csp-embedded-enforcement.idl
+++ b/tests/wpt/web-platform-tests/interfaces/csp-embedded-enforcement.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Content Security Policy: Embedded Enforcement (https://w3c.github.io/webappsec-cspee/)
 
 partial interface HTMLIFrameElement {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-animation-worklet.idl b/tests/wpt/web-platform-tests/interfaces/css-animation-worklet.idl
index 2c46cc7c94c..82d34a3ea2a 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-animation-worklet.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-animation-worklet.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Animation Worklet API (https://drafts.css-houdini.org/css-animationworklet-1/)
 
 [Exposed=Window]
@@ -10,7 +10,7 @@ partial namespace CSS {
 
 [ Global=(Worklet,AnimationWorklet), Exposed=AnimationWorklet ]
 interface AnimationWorkletGlobalScope : WorkletGlobalScope {
-    void registerAnimator(DOMString name, AnimatorInstanceConstructor animatorCtor);
+    undefined registerAnimator(DOMString name, AnimatorInstanceConstructor animatorCtor);
 };
 
 callback AnimatorInstanceConstructor = any (any options, optional any state);
diff --git a/tests/wpt/web-platform-tests/interfaces/css-animations.idl b/tests/wpt/web-platform-tests/interfaces/css-animations.idl
index 9b34bde2330..81851709432 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-animations.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-animations.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Animations Level 1 (https://drafts.csswg.org/css-animations/)
 
 [Exposed=Window]
@@ -32,8 +32,8 @@ interface CSSKeyframesRule : CSSRule {
            attribute CSSOMString name;
   readonly attribute CSSRuleList cssRules;
 
-  void             appendRule(CSSOMString rule);
-  void             deleteRule(CSSOMString select);
+  undefined        appendRule(CSSOMString rule);
+  undefined        deleteRule(CSSOMString select);
   CSSKeyframeRule? findRule(CSSOMString select);
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/css-conditional.idl b/tests/wpt/web-platform-tests/interfaces/css-conditional.idl
index a57cc6c205e..16f25583be9 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-conditional.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-conditional.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Conditional Rules Module Level 3 (https://drafts.csswg.org/css-conditional-3/)
 
 partial interface CSSRule {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-counter-styles.idl b/tests/wpt/web-platform-tests/interfaces/css-counter-styles.idl
index 5ed4d61e2a4..86c89e1eb2f 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-counter-styles.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-counter-styles.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Counter Styles Level 3 (https://drafts.csswg.org/css-counter-styles/)
 
 partial interface CSSRule {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-device-adapt.idl b/tests/wpt/web-platform-tests/interfaces/css-device-adapt.idl
index 8166d2e75f9..bfd4a6d247d 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-device-adapt.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-device-adapt.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Device Adaptation Module Level 1 (https://drafts.csswg.org/css-device-adapt/)
 
 partial interface CSSRule {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl b/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
index 936ded788bc..31d247e9df2 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-font-loading.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Font Loading Module Level 3 (https://drafts.csswg.org/css-font-loading/)
 
 typedef (ArrayBuffer or ArrayBufferView) BinaryData;
@@ -50,7 +50,7 @@ interface FontFaceSetLoadEvent : Event {
 
 enum FontFaceSetLoadStatus { "loading", "loaded" };
 
-callback ForEachCallback = void (FontFace font, long index, FontFaceSet self);
+callback ForEachCallback = undefined (FontFace font, long index, FontFaceSet self);
 
 [Exposed=(Window,Worker)]
 interface FontFaceSet : EventTarget {
@@ -60,7 +60,7 @@ interface FontFaceSet : EventTarget {
   setlike<FontFace>;
   FontFaceSet add(FontFace font);
   boolean delete(FontFace font);
-  void clear();
+  undefined clear();
 
   // events for when loading state changes
   attribute EventHandler onloading;
diff --git a/tests/wpt/web-platform-tests/interfaces/css-fonts.idl b/tests/wpt/web-platform-tests/interfaces/css-fonts.idl
index 42e88e46c54..7282bffee8b 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-fonts.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-fonts.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Fonts Module Level 4 (https://drafts.csswg.org/css-fonts-4/)
 
 [Exposed=Window]
@@ -24,9 +24,10 @@ interface CSSFontFeatureValuesRule : CSSRule {
 [Exposed=Window]
 interface CSSFontFeatureValuesMap {
   maplike<CSSOMString, sequence<unsigned long>>;
-  void set(CSSOMString featureValueName,
+  undefined set(CSSOMString featureValueName,
            (unsigned long or sequence<unsigned long>) values);
 };
+
 partial interface CSSRule {  const unsigned short FONT_PALETTE_VALUES_RULE = 15;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/css-images.idl b/tests/wpt/web-platform-tests/interfaces/css-images.idl
index 62e0480f8ef..8866b008ccb 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-images.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-images.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Images Module Level 4 (https://drafts.csswg.org/css-images-4/)
 
 partial namespace CSS {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-layout-api.idl b/tests/wpt/web-platform-tests/interfaces/css-layout-api.idl
index 31ab6eb4d0b..f6ac4c17e27 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-layout-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-layout-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Layout API Level 1 (https://drafts.css-houdini.org/css-layout-api-1/)
 
 partial namespace CSS {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-masking.idl b/tests/wpt/web-platform-tests/interfaces/css-masking.idl
index 6db59eddbe0..72fbd9aa1ff 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-masking.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-masking.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Masking Module Level 1 (https://drafts.fxtf.org/css-masking-1/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/css-paint-api.idl b/tests/wpt/web-platform-tests/interfaces/css-paint-api.idl
index c636e2e7d37..0924c535566 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-paint-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-paint-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Painting API Level 1 (https://drafts.css-houdini.org/css-paint-api-1/)
 
 partial namespace CSS {
@@ -9,7 +9,7 @@ partial namespace CSS {
 
 [Global=(Worklet,PaintWorklet),Exposed=PaintWorklet]
 interface PaintWorkletGlobalScope : WorkletGlobalScope {
-    void registerPaint(DOMString name, VoidFunction paintCtor);
+    undefined registerPaint(DOMString name, VoidFunction paintCtor);
     readonly attribute unrestricted double devicePixelRatio;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/css-parser-api.idl b/tests/wpt/web-platform-tests/interfaces/css-parser-api.idl
index f3e586785dc..ddb0c0d5ebb 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-parser-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-parser-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Parser API (https://wicg.github.io/css-parser-api/)
 
 typedef (DOMString or ReadableStream) CSSStringSource;
diff --git a/tests/wpt/web-platform-tests/interfaces/css-properties-values-api.idl b/tests/wpt/web-platform-tests/interfaces/css-properties-values-api.idl
index d8f54b1e15b..eb7d7b027e7 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-properties-values-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-properties-values-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Properties and Values API Level 1 (https://drafts.css-houdini.org/css-properties-values-api-1/)
 
 dictionary PropertyDefinition {
@@ -11,7 +11,7 @@ dictionary PropertyDefinition {
 };
 
 partial namespace CSS {
-  void registerProperty(PropertyDefinition definition);
+  undefined registerProperty(PropertyDefinition definition);
 };
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/css-pseudo.idl b/tests/wpt/web-platform-tests/interfaces/css-pseudo.idl
index 2b557e65316..2c90ff2b317 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-pseudo.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-pseudo.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Pseudo-Elements Module Level 4 (https://drafts.csswg.org/css-pseudo-4/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/css-shadow-parts.idl b/tests/wpt/web-platform-tests/interfaces/css-shadow-parts.idl
index c470e8e7dc8..b7ad99671ad 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-shadow-parts.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-shadow-parts.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Shadow Parts (https://drafts.csswg.org/css-shadow-parts/)
 
 partial interface Element {
diff --git a/tests/wpt/web-platform-tests/interfaces/css-transitions.idl b/tests/wpt/web-platform-tests/interfaces/css-transitions.idl
index 15ce4b30f21..174bf209f13 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-transitions.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-transitions.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Transitions (https://drafts.csswg.org/css-transitions/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/css-typed-om.idl b/tests/wpt/web-platform-tests/interfaces/css-typed-om.idl
index 00d3f49bfe6..899ea97f0dd 100644
--- a/tests/wpt/web-platform-tests/interfaces/css-typed-om.idl
+++ b/tests/wpt/web-platform-tests/interfaces/css-typed-om.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Typed OM Level 1 (https://drafts.css-houdini.org/css-typed-om-1/)
 
 [Exposed=(Window, Worker, PaintWorklet, LayoutWorklet)]
@@ -23,10 +23,10 @@ interface StylePropertyMapReadOnly {
 
 [Exposed=Window]
 interface StylePropertyMap : StylePropertyMapReadOnly {
-    void set(USVString property, (CSSStyleValue or USVString)... values);
-    void append(USVString property, (CSSStyleValue or USVString)... values);
-    void delete(USVString property);
-    void clear();
+    undefined set(USVString property, (CSSStyleValue or USVString)... values);
+    undefined append(USVString property, (CSSStyleValue or USVString)... values);
+    undefined delete(USVString property);
+    undefined clear();
 };
 
 partial interface Element {
diff --git a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
index 82517fefcc2..f998758dd32 100644
--- a/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cssom-view.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSSOM View Module (https://drafts.csswg.org/cssom-view/)
 
 enum ScrollBehavior { "auto", "smooth" };
@@ -18,10 +18,10 @@ partial interface Window {
     [SameObject, Replaceable] readonly attribute Screen screen;
 
     // browsing context
-    void moveTo(long x, long y);
-    void moveBy(long x, long y);
-    void resizeTo(long width, long height);
-    void resizeBy(long x, long y);
+    undefined moveTo(long x, long y);
+    undefined moveBy(long x, long y);
+    undefined resizeTo(long width, long height);
+    undefined resizeBy(long x, long y);
 
     // viewport
     [Replaceable] readonly attribute long innerWidth;
@@ -32,12 +32,12 @@ partial interface Window {
     [Replaceable] readonly attribute double pageXOffset;
     [Replaceable] readonly attribute double scrollY;
     [Replaceable] readonly attribute double pageYOffset;
-    void scroll(optional ScrollToOptions options = {});
-    void scroll(unrestricted double x, unrestricted double y);
-    void scrollTo(optional ScrollToOptions options = {});
-    void scrollTo(unrestricted double x, unrestricted double y);
-    void scrollBy(optional ScrollToOptions options = {});
-    void scrollBy(unrestricted double x, unrestricted double y);
+    undefined scroll(optional ScrollToOptions options = {});
+    undefined scroll(unrestricted double x, unrestricted double y);
+    undefined scrollTo(optional ScrollToOptions options = {});
+    undefined scrollTo(unrestricted double x, unrestricted double y);
+    undefined scrollBy(optional ScrollToOptions options = {});
+    undefined scrollBy(unrestricted double x, unrestricted double y);
 
     // client
     [Replaceable] readonly attribute long screenX;
@@ -53,8 +53,8 @@ partial interface Window {
 interface MediaQueryList : EventTarget {
   readonly attribute CSSOMString media;
   readonly attribute boolean matches;
-  void addListener(EventListener? callback);
-  void removeListener(EventListener? callback);
+  undefined addListener(EventListener? callback);
+  undefined removeListener(EventListener? callback);
            attribute EventHandler onchange;
 };
 
@@ -103,13 +103,13 @@ dictionary ScrollIntoViewOptions : ScrollOptions {
 partial interface Element {
   DOMRectList getClientRects();
   [NewObject] DOMRect getBoundingClientRect();
-  void scrollIntoView(optional (boolean or ScrollIntoViewOptions) arg = {});
-  void scroll(optional ScrollToOptions options = {});
-  void scroll(unrestricted double x, unrestricted double y);
-  void scrollTo(optional ScrollToOptions options = {});
-  void scrollTo(unrestricted double x, unrestricted double y);
-  void scrollBy(optional ScrollToOptions options = {});
-  void scrollBy(unrestricted double x, unrestricted double y);
+  undefined scrollIntoView(optional (boolean or ScrollIntoViewOptions) arg = {});
+  undefined scroll(optional ScrollToOptions options = {});
+  undefined scroll(unrestricted double x, unrestricted double y);
+  undefined scrollTo(optional ScrollToOptions options = {});
+  undefined scrollTo(unrestricted double x, unrestricted double y);
+  undefined scrollBy(optional ScrollToOptions options = {});
+  undefined scrollBy(unrestricted double x, unrestricted double y);
   attribute unrestricted double scrollTop;
   attribute unrestricted double scrollLeft;
   readonly attribute long scrollWidth;
diff --git a/tests/wpt/web-platform-tests/interfaces/cssom.idl b/tests/wpt/web-platform-tests/interfaces/cssom.idl
index b7d9c33d596..9a48740de45 100644
--- a/tests/wpt/web-platform-tests/interfaces/cssom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cssom.idl
@@ -1,5 +1,5 @@
 // GENERATED PREAMBLE - DO NOT EDIT
-// This preamble was added by reffy-reports for web-platform-tests.
+// This preamble was added by webref for web-platform-tests.
 // CSSOMString is an implementation-defined type of either DOMString or
 // USVString in CSSOM: https://drafts.csswg.org/cssom/#cssomstring-type
 // For web-platform-tests, use DOMString because USVString has additional
@@ -8,8 +8,8 @@
 typedef DOMString CSSOMString;
 
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Object Model (CSSOM) (https://drafts.csswg.org/cssom/)
 
 [Exposed=Window]
@@ -17,8 +17,8 @@ interface MediaList {
   stringifier attribute [LegacyNullToEmptyString] CSSOMString mediaText;
   readonly attribute unsigned long length;
   getter CSSOMString? item(unsigned long index);
-  void appendMedium(CSSOMString medium);
-  void deleteMedium(CSSOMString medium);
+  undefined appendMedium(CSSOMString medium);
+  undefined deleteMedium(CSSOMString medium);
 };
 
 [Exposed=Window]
@@ -37,13 +37,13 @@ interface CSSStyleSheet : StyleSheet {
   readonly attribute CSSRule? ownerRule;
   [SameObject] readonly attribute CSSRuleList cssRules;
   unsigned long insertRule(CSSOMString rule, optional unsigned long index = 0);
-  void deleteRule(unsigned long index);
+  undefined deleteRule(unsigned long index);
 };
 
 partial interface CSSStyleSheet {
   [SameObject] readonly attribute CSSRuleList rules;
   long addRule(optional DOMString selector = "undefined", optional DOMString style = "undefined", optional unsigned long index);
-  void removeRule(optional unsigned long index = 0);
+  undefined removeRule(optional unsigned long index = 0);
 };
 
 [Exposed=Window]
@@ -102,7 +102,7 @@ interface CSSImportRule : CSSRule {
 interface CSSGroupingRule : CSSRule {
   [SameObject] readonly attribute CSSRuleList cssRules;
   unsigned long insertRule(CSSOMString rule, optional unsigned long index = 0);
-  void deleteRule(unsigned long index);
+  undefined deleteRule(unsigned long index);
 };
 
 [Exposed=Window]
@@ -130,7 +130,7 @@ interface CSSStyleDeclaration {
   getter CSSOMString item(unsigned long index);
   CSSOMString getPropertyValue(CSSOMString property);
   CSSOMString getPropertyPriority(CSSOMString property);
-  [CEReactions] void setProperty(CSSOMString property, [LegacyNullToEmptyString] CSSOMString value, optional [LegacyNullToEmptyString] CSSOMString priority = "");
+  [CEReactions] undefined setProperty(CSSOMString property, [LegacyNullToEmptyString] CSSOMString value, optional [LegacyNullToEmptyString] CSSOMString priority = "");
   [CEReactions] CSSOMString removeProperty(CSSOMString property);
   readonly attribute CSSRule? parentRule;
   [CEReactions] attribute [LegacyNullToEmptyString] CSSOMString cssFloat;
diff --git a/tests/wpt/web-platform-tests/interfaces/custom-state-pseudo-class.idl b/tests/wpt/web-platform-tests/interfaces/custom-state-pseudo-class.idl
index 8fcd287acd3..d4e3da7e6a1 100644
--- a/tests/wpt/web-platform-tests/interfaces/custom-state-pseudo-class.idl
+++ b/tests/wpt/web-platform-tests/interfaces/custom-state-pseudo-class.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Custom State Pseudo Class (https://wicg.github.io/custom-state-pseudo-class/)
 
 partial interface ElementInternals {
diff --git a/tests/wpt/web-platform-tests/interfaces/deprecation-reporting.idl b/tests/wpt/web-platform-tests/interfaces/deprecation-reporting.idl
index e62711936b5..72622becb2c 100644
--- a/tests/wpt/web-platform-tests/interfaces/deprecation-reporting.idl
+++ b/tests/wpt/web-platform-tests/interfaces/deprecation-reporting.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Deprecation Reporting (https://wicg.github.io/deprecation-reporting/)
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/device-memory.idl b/tests/wpt/web-platform-tests/interfaces/device-memory.idl
index f664013ddef..3be709e8a20 100644
--- a/tests/wpt/web-platform-tests/interfaces/device-memory.idl
+++ b/tests/wpt/web-platform-tests/interfaces/device-memory.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Device Memory 1 (https://w3c.github.io/device-memory/)
 
 [
diff --git a/tests/wpt/web-platform-tests/interfaces/dom-overlays.idl b/tests/wpt/web-platform-tests/interfaces/dom-overlays.idl
index 958da865118..5e358c233c3 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom-overlays.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom-overlays.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebXR DOM Overlays Module (https://immersive-web.github.io/dom-overlays/)
 
 partial interface mixin GlobalEventHandlers {
diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/web-platform-tests/interfaces/dom.idl
index 102c2312381..ffc5b063219 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: DOM Standard (https://dom.spec.whatwg.org/)
 
 [Exposed=(Window,Worker,AudioWorklet)]
@@ -19,21 +19,21 @@ interface Event {
   const unsigned short BUBBLING_PHASE = 3;
   readonly attribute unsigned short eventPhase;
 
-  void stopPropagation();
+  undefined stopPropagation();
            attribute boolean cancelBubble; // historical alias of .stopPropagation
-  void stopImmediatePropagation();
+  undefined stopImmediatePropagation();
 
   readonly attribute boolean bubbles;
   readonly attribute boolean cancelable;
            attribute boolean returnValue;  // historical
-  void preventDefault();
+  undefined preventDefault();
   readonly attribute boolean defaultPrevented;
   readonly attribute boolean composed;
 
   [LegacyUnforgeable] readonly attribute boolean isTrusted;
   readonly attribute DOMHighResTimeStamp timeStamp;
 
-  void initEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false); // historical
+  undefined initEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false); // historical
 };
 
 dictionary EventInit {
@@ -52,7 +52,7 @@ interface CustomEvent : Event {
 
   readonly attribute any detail;
 
-  void initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null); // historical
+  undefined initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null); // historical
 };
 
 dictionary CustomEventInit : EventInit {
@@ -63,13 +63,13 @@ dictionary CustomEventInit : EventInit {
 interface EventTarget {
   constructor();
 
-  void addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = {});
-  void removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options = {});
+  undefined addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = {});
+  undefined removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options = {});
   boolean dispatchEvent(Event event);
 };
 
 callback interface EventListener {
-  void handleEvent(Event event);
+  undefined handleEvent(Event event);
 };
 
 dictionary EventListenerOptions {
@@ -87,7 +87,7 @@ interface AbortController {
 
   [SameObject] readonly attribute AbortSignal signal;
 
-  void abort();
+  undefined abort();
 };
 
 [Exposed=(Window,Worker)]
@@ -113,9 +113,9 @@ interface mixin ParentNode {
   readonly attribute Element? lastElementChild;
   readonly attribute unsigned long childElementCount;
 
-  [CEReactions, Unscopable] void prepend((Node or DOMString)... nodes);
-  [CEReactions, Unscopable] void append((Node or DOMString)... nodes);
-  [CEReactions, Unscopable] void replaceChildren((Node or DOMString)... nodes);
+  [CEReactions, Unscopable] undefined prepend((Node or DOMString)... nodes);
+  [CEReactions, Unscopable] undefined append((Node or DOMString)... nodes);
+  [CEReactions, Unscopable] undefined replaceChildren((Node or DOMString)... nodes);
 
   Element? querySelector(DOMString selectors);
   [NewObject] NodeList querySelectorAll(DOMString selectors);
@@ -132,10 +132,10 @@ Element includes NonDocumentTypeChildNode;
 CharacterData includes NonDocumentTypeChildNode;
 
 interface mixin ChildNode {
-  [CEReactions, Unscopable] void before((Node or DOMString)... nodes);
-  [CEReactions, Unscopable] void after((Node or DOMString)... nodes);
-  [CEReactions, Unscopable] void replaceWith((Node or DOMString)... nodes);
-  [CEReactions, Unscopable] void remove();
+  [CEReactions, Unscopable] undefined before((Node or DOMString)... nodes);
+  [CEReactions, Unscopable] undefined after((Node or DOMString)... nodes);
+  [CEReactions, Unscopable] undefined replaceWith((Node or DOMString)... nodes);
+  [CEReactions, Unscopable] undefined remove();
 };
 DocumentType includes ChildNode;
 Element includes ChildNode;
@@ -165,12 +165,12 @@ interface HTMLCollection {
 interface MutationObserver {
   constructor(MutationCallback callback);
 
-  void observe(Node target, optional MutationObserverInit options = {});
-  void disconnect();
+  undefined observe(Node target, optional MutationObserverInit options = {});
+  undefined disconnect();
   sequence<MutationRecord> takeRecords();
 };
 
-callback MutationCallback = void (sequence<MutationRecord> mutations, MutationObserver observer);
+callback MutationCallback = undefined (sequence<MutationRecord> mutations, MutationObserver observer);
 
 dictionary MutationObserverInit {
   boolean childList = false;
@@ -228,7 +228,7 @@ interface Node : EventTarget {
 
   [CEReactions] attribute DOMString? nodeValue;
   [CEReactions] attribute DOMString? textContent;
-  [CEReactions] void normalize();
+  [CEReactions] undefined normalize();
 
   [CEReactions, NewObject] Node cloneNode(optional boolean deep = false);
   boolean isEqualNode(Node? otherNode);
@@ -353,10 +353,10 @@ interface Element : Node {
   sequence<DOMString> getAttributeNames();
   DOMString? getAttribute(DOMString qualifiedName);
   DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
-  [CEReactions] void setAttribute(DOMString qualifiedName, DOMString value);
-  [CEReactions] void setAttributeNS(DOMString? namespace, DOMString qualifiedName, DOMString value);
-  [CEReactions] void removeAttribute(DOMString qualifiedName);
-  [CEReactions] void removeAttributeNS(DOMString? namespace, DOMString localName);
+  [CEReactions] undefined setAttribute(DOMString qualifiedName, DOMString value);
+  [CEReactions] undefined setAttributeNS(DOMString? namespace, DOMString qualifiedName, DOMString value);
+  [CEReactions] undefined removeAttribute(DOMString qualifiedName);
+  [CEReactions] undefined removeAttributeNS(DOMString? namespace, DOMString localName);
   [CEReactions] boolean toggleAttribute(DOMString qualifiedName, optional boolean force);
   boolean hasAttribute(DOMString qualifiedName);
   boolean hasAttributeNS(DOMString? namespace, DOMString localName);
@@ -379,7 +379,7 @@ interface Element : Node {
   HTMLCollection getElementsByClassName(DOMString classNames);
 
   [CEReactions] Element? insertAdjacentElement(DOMString where, Element element); // historical
-  void insertAdjacentText(DOMString where, DOMString data); // historical
+  undefined insertAdjacentText(DOMString where, DOMString data); // historical
 };
 
 dictionary ShadowRootInit {
@@ -417,10 +417,10 @@ interface CharacterData : Node {
   attribute [LegacyNullToEmptyString] DOMString data;
   readonly attribute unsigned long length;
   DOMString substringData(unsigned long offset, unsigned long count);
-  void appendData(DOMString data);
-  void insertData(unsigned long offset, DOMString data);
-  void deleteData(unsigned long offset, unsigned long count);
-  void replaceData(unsigned long offset, unsigned long count, DOMString data);
+  undefined appendData(DOMString data);
+  undefined insertData(unsigned long offset, DOMString data);
+  undefined deleteData(unsigned long offset, unsigned long count);
+  undefined replaceData(unsigned long offset, unsigned long count, DOMString data);
 };
 
 [Exposed=Window]
@@ -470,15 +470,15 @@ interface Range : AbstractRange {
 
   readonly attribute Node commonAncestorContainer;
 
-  void setStart(Node node, unsigned long offset);
-  void setEnd(Node node, unsigned long offset);
-  void setStartBefore(Node node);
-  void setStartAfter(Node node);
-  void setEndBefore(Node node);
-  void setEndAfter(Node node);
-  void collapse(optional boolean toStart = false);
-  void selectNode(Node node);
-  void selectNodeContents(Node node);
+  undefined setStart(Node node, unsigned long offset);
+  undefined setEnd(Node node, unsigned long offset);
+  undefined setStartBefore(Node node);
+  undefined setStartAfter(Node node);
+  undefined setEndBefore(Node node);
+  undefined setEndAfter(Node node);
+  undefined collapse(optional boolean toStart = false);
+  undefined selectNode(Node node);
+  undefined selectNodeContents(Node node);
 
   const unsigned short START_TO_START = 0;
   const unsigned short START_TO_END = 1;
@@ -486,14 +486,14 @@ interface Range : AbstractRange {
   const unsigned short END_TO_START = 3;
   short compareBoundaryPoints(unsigned short how, Range sourceRange);
 
-  [CEReactions] void deleteContents();
+  [CEReactions] undefined deleteContents();
   [CEReactions, NewObject] DocumentFragment extractContents();
   [CEReactions, NewObject] DocumentFragment cloneContents();
-  [CEReactions] void insertNode(Node node);
-  [CEReactions] void surroundContents(Node newParent);
+  [CEReactions] undefined insertNode(Node node);
+  [CEReactions] undefined surroundContents(Node newParent);
 
   [NewObject] Range cloneRange();
-  void detach();
+  undefined detach();
 
   boolean isPointInRange(Node node, unsigned long offset);
   short comparePoint(Node node, unsigned long offset);
@@ -514,7 +514,7 @@ interface NodeIterator {
   Node? nextNode();
   Node? previousNode();
 
-  void detach();
+  undefined detach();
 };
 
 [Exposed=Window]
@@ -562,8 +562,8 @@ interface DOMTokenList {
   readonly attribute unsigned long length;
   getter DOMString? item(unsigned long index);
   boolean contains(DOMString token);
-  [CEReactions] void add(DOMString... tokens);
-  [CEReactions] void remove(DOMString... tokens);
+  [CEReactions] undefined add(DOMString... tokens);
+  [CEReactions] undefined remove(DOMString... tokens);
   [CEReactions] boolean toggle(DOMString token, optional boolean force);
   [CEReactions] boolean replace(DOMString token, DOMString newToken);
   boolean supports(DOMString token);
diff --git a/tests/wpt/web-platform-tests/interfaces/element-timing.idl b/tests/wpt/web-platform-tests/interfaces/element-timing.idl
index 6a54bbd2af6..70ca384894f 100644
--- a/tests/wpt/web-platform-tests/interfaces/element-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/element-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Element Timing API (https://wicg.github.io/element-timing/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/encoding.idl b/tests/wpt/web-platform-tests/interfaces/encoding.idl
index d00624fa1ed..bae48f11993 100644
--- a/tests/wpt/web-platform-tests/interfaces/encoding.idl
+++ b/tests/wpt/web-platform-tests/interfaces/encoding.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Encoding Standard (https://encoding.spec.whatwg.org/)
 
 interface mixin TextDecoderCommon {
diff --git a/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl b/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl
index 5d6bbe36ce3..0a43cb7481b 100644
--- a/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl
+++ b/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Encrypted Media Extensions (https://w3c.github.io/encrypted-media/)
 
 [Exposed=Window]
@@ -50,15 +50,15 @@ enum MediaKeySessionType {
 [Exposed=Window, SecureContext] interface MediaKeySession : EventTarget {
     readonly        attribute DOMString           sessionId;
     readonly        attribute unrestricted double expiration;
-    readonly        attribute Promise<void>       closed;
+    readonly        attribute Promise<undefined>       closed;
     readonly        attribute MediaKeyStatusMap   keyStatuses;
                     attribute EventHandler        onkeystatuseschange;
                     attribute EventHandler        onmessage;
-    Promise<void>    generateRequest (DOMString initDataType, BufferSource initData);
+    Promise<undefined>    generateRequest (DOMString initDataType, BufferSource initData);
     Promise<boolean> load (DOMString sessionId);
-    Promise<void>    update (BufferSource response);
-    Promise<void>    close ();
-    Promise<void>    remove ();
+    Promise<undefined>    update (BufferSource response);
+    Promise<undefined>    close ();
+    Promise<undefined>    remove ();
 };
 
 [Exposed=Window, SecureContext] interface MediaKeyStatusMap {
@@ -74,6 +74,7 @@ enum MediaKeyStatus {
     "released",
     "output-restricted",
     "output-downscaled",
+    "usable-in-future",
     "status-pending",
     "internal-error"
 };
@@ -101,7 +102,7 @@ dictionary MediaKeyMessageEventInit : EventInit {
     [SecureContext] readonly        attribute MediaKeys?   mediaKeys;
                                     attribute EventHandler onencrypted;
                                     attribute EventHandler onwaitingforkey;
-    [SecureContext] Promise<void> setMediaKeys (MediaKeys? mediaKeys);
+    [SecureContext] Promise<undefined> setMediaKeys (MediaKeys? mediaKeys);
 };
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/entries-api.idl b/tests/wpt/web-platform-tests/interfaces/entries-api.idl
index 52693138a4c..cd536bc6988 100644
--- a/tests/wpt/web-platform-tests/interfaces/entries-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/entries-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: File and Directory Entries API (https://wicg.github.io/entries-api/)
 
 partial interface File {
@@ -16,7 +16,7 @@ partial interface DataTransferItem {
     FileSystemEntry? webkitGetAsEntry();
 };
 
-callback ErrorCallback = void (DOMException err);
+callback ErrorCallback = undefined (DOMException err);
 
 [Exposed=Window]
 interface FileSystemEntry {
@@ -26,18 +26,18 @@ interface FileSystemEntry {
     readonly attribute USVString fullPath;
     readonly attribute FileSystem filesystem;
 
-    void getParent(optional FileSystemEntryCallback successCallback,
+    undefined getParent(optional FileSystemEntryCallback successCallback,
                    optional ErrorCallback errorCallback);
 };
 
 [Exposed=Window]
 interface FileSystemDirectoryEntry : FileSystemEntry {
     FileSystemDirectoryReader createReader();
-    void getFile(optional USVString? path,
+    undefined getFile(optional USVString? path,
                  optional FileSystemFlags options = {},
                  optional FileSystemEntryCallback successCallback,
                  optional ErrorCallback errorCallback);
-    void getDirectory(optional USVString? path,
+    undefined getDirectory(optional USVString? path,
                       optional FileSystemFlags options = {},
                       optional FileSystemEntryCallback successCallback,
                       optional ErrorCallback errorCallback);
@@ -48,21 +48,21 @@ dictionary FileSystemFlags {
     boolean exclusive = false;
 };
 
-callback FileSystemEntryCallback = void (FileSystemEntry entry);
+callback FileSystemEntryCallback = undefined (FileSystemEntry entry);
 
 [Exposed=Window]
 interface FileSystemDirectoryReader {
-    void readEntries(FileSystemEntriesCallback successCallback,
+    undefined readEntries(FileSystemEntriesCallback successCallback,
                      optional ErrorCallback errorCallback);
 };
-callback FileSystemEntriesCallback = void (sequence<FileSystemEntry> entries);
+callback FileSystemEntriesCallback = undefined (sequence<FileSystemEntry> entries);
 
 [Exposed=Window]
 interface FileSystemFileEntry : FileSystemEntry {
-    void file(FileCallback successCallback,
+    undefined file(FileCallback successCallback,
               optional ErrorCallback errorCallback);
 };
-callback FileCallback = void (File file);
+callback FileCallback = undefined (File file);
 
 [Exposed=Window]
 interface FileSystem {
diff --git a/tests/wpt/web-platform-tests/interfaces/event-timing.idl b/tests/wpt/web-platform-tests/interfaces/event-timing.idl
index d84d7c32dcc..492c5ce0121 100644
--- a/tests/wpt/web-platform-tests/interfaces/event-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/event-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Event Timing API (https://wicg.github.io/event-timing/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/feature-policy.idl b/tests/wpt/web-platform-tests/interfaces/feature-policy.idl
index f59f090769e..4f22cf29943 100644
--- a/tests/wpt/web-platform-tests/interfaces/feature-policy.idl
+++ b/tests/wpt/web-platform-tests/interfaces/feature-policy.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Feature Policy (https://w3c.github.io/webappsec-feature-policy/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/fetch.idl b/tests/wpt/web-platform-tests/interfaces/fetch.idl
index 1d8a97ef940..a9304e90ef8 100644
--- a/tests/wpt/web-platform-tests/interfaces/fetch.idl
+++ b/tests/wpt/web-platform-tests/interfaces/fetch.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Fetch Standard (https://fetch.spec.whatwg.org/)
 
 typedef (sequence<sequence<ByteString>> or record<ByteString, ByteString>) HeadersInit;
@@ -9,11 +9,11 @@ typedef (sequence<sequence<ByteString>> or record<ByteString, ByteString>) Heade
 interface Headers {
   constructor(optional HeadersInit init);
 
-  void append(ByteString name, ByteString value);
-  void delete(ByteString name);
+  undefined append(ByteString name, ByteString value);
+  undefined delete(ByteString name);
   ByteString? get(ByteString name);
   boolean has(ByteString name);
-  void set(ByteString name, ByteString value);
+  undefined set(ByteString name, ByteString value);
   iterable<ByteString, ByteString>;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/filter-effects.idl b/tests/wpt/web-platform-tests/interfaces/filter-effects.idl
index 718dcee7476..b17ebf67890 100644
--- a/tests/wpt/web-platform-tests/interfaces/filter-effects.idl
+++ b/tests/wpt/web-platform-tests/interfaces/filter-effects.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Filter Effects Module Level 1 (https://drafts.fxtf.org/filter-effects-1/)
 
 interface SVGFilterElement : SVGElement {
diff --git a/tests/wpt/web-platform-tests/interfaces/fullscreen.idl b/tests/wpt/web-platform-tests/interfaces/fullscreen.idl
index 677b2e116f6..2f67f09a394 100644
--- a/tests/wpt/web-platform-tests/interfaces/fullscreen.idl
+++ b/tests/wpt/web-platform-tests/interfaces/fullscreen.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Fullscreen API Standard (https://fullscreen.spec.whatwg.org/)
 
 enum FullscreenNavigationUI {
@@ -14,7 +14,7 @@ dictionary FullscreenOptions {
 };
 
 partial interface Element {
-  Promise<void> requestFullscreen(optional FullscreenOptions options = {});
+  Promise<undefined> requestFullscreen(optional FullscreenOptions options = {});
 
   attribute EventHandler onfullscreenchange;
   attribute EventHandler onfullscreenerror;
@@ -24,7 +24,7 @@ partial interface Document {
   [LegacyLenientSetter] readonly attribute boolean fullscreenEnabled;
   [LegacyLenientSetter, Unscopable] readonly attribute boolean fullscreen; // historical
 
-  Promise<void> exitFullscreen();
+  Promise<undefined> exitFullscreen();
 
   attribute EventHandler onfullscreenchange;
   attribute EventHandler onfullscreenerror;
diff --git a/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl b/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl
index f2a2811b4b4..2d353b061c4 100644
--- a/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl
+++ b/tests/wpt/web-platform-tests/interfaces/gamepad-extensions.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Gamepad Extensions (https://w3c.github.io/gamepad/extensions.html)
 
 enum GamepadHand {
diff --git a/tests/wpt/web-platform-tests/interfaces/gamepad.idl b/tests/wpt/web-platform-tests/interfaces/gamepad.idl
index 27541bf2553..c8a2fc590a8 100644
--- a/tests/wpt/web-platform-tests/interfaces/gamepad.idl
+++ b/tests/wpt/web-platform-tests/interfaces/gamepad.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Gamepad (https://w3c.github.io/gamepad/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/generic-sensor.idl b/tests/wpt/web-platform-tests/interfaces/generic-sensor.idl
index f3eeb9bf968..157072f6341 100644
--- a/tests/wpt/web-platform-tests/interfaces/generic-sensor.idl
+++ b/tests/wpt/web-platform-tests/interfaces/generic-sensor.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Generic Sensor API (https://w3c.github.io/sensors/)
 
 [SecureContext, Exposed=(DedicatedWorker, Window)]
@@ -8,8 +8,8 @@ interface Sensor : EventTarget {
   readonly attribute boolean activated;
   readonly attribute boolean hasReading;
   readonly attribute DOMHighResTimeStamp? timestamp;
-  void start();
-  void stop();
+  undefined start();
+  undefined stop();
   attribute EventHandler onreading;
   attribute EventHandler onactivate;
   attribute EventHandler onerror;
diff --git a/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl b/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl
index 8bce6413816..15bb7349dd3 100644
--- a/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl
+++ b/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Geolocation API Specification (https://w3c.github.io/geolocation-api/)
 
 partial interface Navigator {
@@ -9,7 +9,7 @@ partial interface Navigator {
 
 [Exposed=Window]
 interface Geolocation {
-  void getCurrentPosition(PositionCallback successCallback,
+  undefined getCurrentPosition(PositionCallback successCallback,
                           optional PositionErrorCallback errorCallback,
                           optional PositionOptions options = {});
 
@@ -17,12 +17,12 @@ interface Geolocation {
                       optional PositionErrorCallback errorCallback,
                       optional PositionOptions options = {});
 
-  void clearWatch(long watchId);
+  undefined clearWatch(long watchId);
 };
 
-callback PositionCallback = void (GeolocationPosition position);
+callback PositionCallback = undefined (GeolocationPosition position);
 
-callback PositionErrorCallback = void (GeolocationPositionError positionError);
+callback PositionErrorCallback = undefined (GeolocationPositionError positionError);
 
 dictionary PositionOptions {
   boolean enableHighAccuracy = false;
diff --git a/tests/wpt/web-platform-tests/interfaces/geolocation-sensor.idl b/tests/wpt/web-platform-tests/interfaces/geolocation-sensor.idl
index baa0f5c7a1e..e1d676205ff 100644
--- a/tests/wpt/web-platform-tests/interfaces/geolocation-sensor.idl
+++ b/tests/wpt/web-platform-tests/interfaces/geolocation-sensor.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Geolocation Sensor (https://w3c.github.io/geolocation-sensor/)
 
 [SecureContext,
diff --git a/tests/wpt/web-platform-tests/interfaces/geometry.idl b/tests/wpt/web-platform-tests/interfaces/geometry.idl
index ada6c0c302c..a1159c0d77a 100644
--- a/tests/wpt/web-platform-tests/interfaces/geometry.idl
+++ b/tests/wpt/web-platform-tests/interfaces/geometry.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Geometry Interfaces Module Level 1 (https://drafts.fxtf.org/geometry/)
 
 [Exposed=(Window,Worker),
diff --git a/tests/wpt/web-platform-tests/interfaces/get-installed-related-apps.idl b/tests/wpt/web-platform-tests/interfaces/get-installed-related-apps.idl
index cbea101d300..e096044c2bc 100644
--- a/tests/wpt/web-platform-tests/interfaces/get-installed-related-apps.idl
+++ b/tests/wpt/web-platform-tests/interfaces/get-installed-related-apps.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Get Installed Related Apps API (https://wicg.github.io/get-installed-related-apps/spec/)
 
 dictionary RelatedApplication {
diff --git a/tests/wpt/web-platform-tests/interfaces/gyroscope.idl b/tests/wpt/web-platform-tests/interfaces/gyroscope.idl
index 3754fd81e6b..00fb0efcace 100644
--- a/tests/wpt/web-platform-tests/interfaces/gyroscope.idl
+++ b/tests/wpt/web-platform-tests/interfaces/gyroscope.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Gyroscope (https://w3c.github.io/gyroscope/)
 
 [SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/hit-test.idl b/tests/wpt/web-platform-tests/interfaces/hit-test.idl
index d9f90b3ec7b..14f1ea7c91c 100644
--- a/tests/wpt/web-platform-tests/interfaces/hit-test.idl
+++ b/tests/wpt/web-platform-tests/interfaces/hit-test.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebXR Hit Test Module (https://immersive-web.github.io/hit-test/)
 
 enum XRHitTestTrackableType {
diff --git a/tests/wpt/web-platform-tests/interfaces/hr-time.idl b/tests/wpt/web-platform-tests/interfaces/hr-time.idl
index 8179c66f44d..93537d64ad1 100644
--- a/tests/wpt/web-platform-tests/interfaces/hr-time.idl
+++ b/tests/wpt/web-platform-tests/interfaces/hr-time.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: High Resolution Time (https://w3c.github.io/hr-time/)
 
 typedef double DOMHighResTimeStamp;
diff --git a/tests/wpt/web-platform-tests/interfaces/html-media-capture.idl b/tests/wpt/web-platform-tests/interfaces/html-media-capture.idl
index 3a8c12165f5..696dce6789f 100644
--- a/tests/wpt/web-platform-tests/interfaces/html-media-capture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html-media-capture.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: HTML Media Capture (https://w3c.github.io/html-media-capture/)
 
 partial interface HTMLInputElement {
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 09e1a29043b..e92bb8690dd 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: HTML Standard (https://html.spec.whatwg.org/multipage/)
 
 [Exposed=Window,
@@ -29,9 +29,9 @@ interface RadioNodeList : NodeList {
 interface HTMLOptionsCollection : HTMLCollection {
   // inherits item(), namedItem()
   [CEReactions] attribute unsigned long length; // shadows inherited length
-  [CEReactions] setter void (unsigned long index, HTMLOptionElement? option);
-  [CEReactions] void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
-  [CEReactions] void remove(long index);
+  [CEReactions] setter undefined (unsigned long index, HTMLOptionElement? option);
+  [CEReactions] undefined add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+  [CEReactions] undefined remove(long index);
   attribute long selectedIndex;
 };
 
@@ -73,9 +73,9 @@ partial interface Document {
   // dynamic markup insertion
   [CEReactions] Document open(optional DOMString unused1, optional DOMString unused2); // both arguments are ignored
   WindowProxy? open(USVString url, DOMString name, DOMString features);
-  [CEReactions] void close();
-  [CEReactions] void write(DOMString... text);
-  [CEReactions] void writeln(DOMString... text);
+  [CEReactions] undefined close();
+  [CEReactions] undefined write(DOMString... text);
+  [CEReactions] undefined writeln(DOMString... text);
 
   // user interaction
   readonly attribute WindowProxy? defaultView;
@@ -112,7 +112,7 @@ interface HTMLElement : Element {
 
   // user interaction
   [CEReactions] attribute boolean hidden;
-  void click();
+  undefined click();
   [CEReactions] attribute DOMString accessKey;
   readonly attribute DOMString accessKeyLabel;
   [CEReactions] attribute boolean draggable;
@@ -140,21 +140,23 @@ interface mixin HTMLOrSVGElement {
 
   [CEReactions] attribute boolean autofocus;
   [CEReactions] attribute long tabIndex;
-  void focus(optional FocusOptions options = {});
-  void blur();
+  undefined focus(optional FocusOptions options = {});
+  undefined blur();
 };
 
 [Exposed=Window,
  LegacyOverrideBuiltIns]
 interface DOMStringMap {
   getter DOMString (DOMString name);
-  [CEReactions] setter void (DOMString name, DOMString value);
-  [CEReactions] deleter void (DOMString name);
+  [CEReactions] setter undefined (DOMString name, DOMString value);
+  [CEReactions] deleter undefined (DOMString name);
 };
 
 [Exposed=Window]
 interface HTMLHtmlElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -195,6 +197,8 @@ interface HTMLLinkElement : HTMLElement {
   [CEReactions] attribute DOMString imageSizes;
   [CEReactions] attribute DOMString referrerPolicy;
   [CEReactions] attribute boolean disabled;
+
+  // also has obsolete members
 };
 HTMLLinkElement includes LinkStyle;
 
@@ -205,6 +209,8 @@ interface HTMLMetaElement : HTMLElement {
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute DOMString httpEquiv;
   [CEReactions] attribute DOMString content;
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -212,12 +218,16 @@ interface HTMLStyleElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   [CEReactions] attribute DOMString media;
+
+  // also has obsolete members
 };
 HTMLStyleElement includes LinkStyle;
 
 [Exposed=Window]
 interface HTMLBodyElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 HTMLBodyElement includes WindowEventHandlers;
@@ -225,21 +235,29 @@ HTMLBodyElement includes WindowEventHandlers;
 [Exposed=Window]
 interface HTMLHeadingElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLParagraphElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLHRElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLPreElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -256,16 +274,22 @@ interface HTMLOListElement : HTMLElement {
   [CEReactions] attribute boolean reversed;
   [CEReactions] attribute long start;
   [CEReactions] attribute DOMString type;
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLUListElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLMenuElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -273,16 +297,22 @@ interface HTMLLIElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   [CEReactions] attribute long value;
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLDListElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLDivElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -300,6 +330,8 @@ interface HTMLAnchorElement : HTMLElement {
   [CEReactions] attribute DOMString text;
 
   [CEReactions] attribute DOMString referrerPolicy;
+
+  // also has obsolete members
 };
 HTMLAnchorElement includes HTMLHyperlinkElementUtils;
 
@@ -325,6 +357,8 @@ interface HTMLSpanElement : HTMLElement {
 [Exposed=Window]
 interface HTMLBRElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 interface mixin HTMLHyperlinkElementUtils {
@@ -387,7 +421,9 @@ interface HTMLImageElement : HTMLElement {
   [CEReactions] attribute DOMString decoding;
   [CEReactions] attribute DOMString loading;
 
-  Promise<void> decode();
+  Promise<undefined> decode();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -404,9 +440,12 @@ interface HTMLIFrameElement : HTMLElement {
   [CEReactions] attribute DOMString width;
   [CEReactions] attribute DOMString height;
   [CEReactions] attribute DOMString referrerPolicy;
+  [CEReactions] attribute DOMString loading;
   readonly attribute Document? contentDocument;
   readonly attribute WindowProxy? contentWindow;
   Document? getSVGDocument();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -418,6 +457,8 @@ interface HTMLEmbedElement : HTMLElement {
   [CEReactions] attribute DOMString width;
   [CEReactions] attribute DOMString height;
   Document? getSVGDocument();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -440,7 +481,9 @@ interface HTMLObjectElement : HTMLElement {
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -449,6 +492,8 @@ interface HTMLParamElement : HTMLElement {
 
   [CEReactions] attribute DOMString name;
   [CEReactions] attribute DOMString value;
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -509,7 +554,7 @@ interface HTMLMediaElement : HTMLElement {
   readonly attribute unsigned short networkState;
   [CEReactions] attribute DOMString preload;
   readonly attribute TimeRanges buffered;
-  void load();
+  undefined load();
   CanPlayTypeResult canPlayType(DOMString type);
 
   // ready state
@@ -523,19 +568,20 @@ interface HTMLMediaElement : HTMLElement {
 
   // playback state
   attribute double currentTime;
-  void fastSeek(double time);
+  undefined fastSeek(double time);
   readonly attribute unrestricted double duration;
   object getStartDate();
   readonly attribute boolean paused;
   attribute double defaultPlaybackRate;
   attribute double playbackRate;
+  attribute boolean preservesPitch;
   readonly attribute TimeRanges played;
   readonly attribute TimeRanges seekable;
   readonly attribute boolean ended;
   [CEReactions] attribute boolean autoplay;
   [CEReactions] attribute boolean loop;
-  Promise<void> play();
-  void pause();
+  Promise<undefined> play();
+  undefined pause();
 
   // controls
   [CEReactions] attribute boolean controls;
@@ -630,8 +676,8 @@ interface TextTrack : EventTarget {
   readonly attribute TextTrackCueList? cues;
   readonly attribute TextTrackCueList? activeCues;
 
-  void addCue(TextTrackCue cue);
-  void removeCue(TextTrackCue cue);
+  undefined addCue(TextTrackCue cue);
+  undefined removeCue(TextTrackCue cue);
 
   attribute EventHandler oncuechange;
 };
@@ -663,9 +709,10 @@ interface TimeRanges {
   double end(unsigned long index);
 };
 
-[Exposed=Window,
- Constructor(DOMString type, optional TrackEventInit eventInitDict = {})]
+[Exposed=Window]
 interface TrackEvent : Event {
+  constructor(DOMString type, optional TrackEventInit eventInitDict = {});
+
   readonly attribute (VideoTrack or AudioTrack or TextTrack)? track;
 };
 
@@ -694,6 +741,8 @@ interface HTMLAreaElement : HTMLElement {
   [CEReactions] attribute DOMString rel;
   [SameObject, PutForwards=value] readonly attribute DOMTokenList relList;
   [CEReactions] attribute DOMString referrerPolicy;
+
+  // also has obsolete members
 };
 HTMLAreaElement includes HTMLHyperlinkElementUtils;
 
@@ -703,27 +752,31 @@ interface HTMLTableElement : HTMLElement {
 
   [CEReactions] attribute HTMLTableCaptionElement? caption;
   HTMLTableCaptionElement createCaption();
-  [CEReactions] void deleteCaption();
+  [CEReactions] undefined deleteCaption();
 
   [CEReactions] attribute HTMLTableSectionElement? tHead;
   HTMLTableSectionElement createTHead();
-  [CEReactions] void deleteTHead();
+  [CEReactions] undefined deleteTHead();
 
   [CEReactions] attribute HTMLTableSectionElement? tFoot;
   HTMLTableSectionElement createTFoot();
-  [CEReactions] void deleteTFoot();
+  [CEReactions] undefined deleteTFoot();
 
   [SameObject] readonly attribute HTMLCollection tBodies;
   HTMLTableSectionElement createTBody();
 
   [SameObject] readonly attribute HTMLCollection rows;
   HTMLTableRowElement insertRow(optional long index = -1);
-  [CEReactions] void deleteRow(long index);
+  [CEReactions] undefined deleteRow(long index);
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
 interface HTMLTableCaptionElement : HTMLElement {
   [HTMLConstructor] constructor();
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -731,6 +784,8 @@ interface HTMLTableColElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   [CEReactions] attribute unsigned long span;
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -739,7 +794,9 @@ interface HTMLTableSectionElement : HTMLElement {
 
   [SameObject] readonly attribute HTMLCollection rows;
   HTMLTableRowElement insertRow(optional long index = -1);
-  [CEReactions] void deleteRow(long index);
+  [CEReactions] undefined deleteRow(long index);
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -750,7 +807,9 @@ interface HTMLTableRowElement : HTMLElement {
   readonly attribute long sectionRowIndex;
   [SameObject] readonly attribute HTMLCollection cells;
   HTMLTableCellElement insertCell(optional long index = -1);
-  [CEReactions] void deleteCell(long index);
+  [CEReactions] undefined deleteCell(long index);
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -764,6 +823,8 @@ interface HTMLTableCellElement : HTMLElement {
 
   [CEReactions] attribute DOMString scope; // only conforming for th elements
   [CEReactions] attribute DOMString abbr;  // only conforming for th elements
+
+  // also has obsolete members
 };
 
 [Exposed=Window,
@@ -789,9 +850,9 @@ interface HTMLFormElement : HTMLElement {
   getter Element (unsigned long index);
   getter (RadioNodeList or Element) (DOMString name);
 
-  void submit();
-  void requestSubmit(optional HTMLElement? submitter = null);
-  [CEReactions] void reset();
+  undefined submit();
+  undefined requestSubmit(optional HTMLElement? submitter = null);
+  [CEReactions] undefined reset();
   boolean checkValidity();
   boolean reportValidity();
 };
@@ -846,25 +907,27 @@ interface HTMLInputElement : HTMLElement {
   attribute unrestricted double valueAsNumber;
   [CEReactions] attribute unsigned long width;
 
-  void stepUp(optional long n = 1);
-  void stepDown(optional long n = 1);
+  undefined stepUp(optional long n = 1);
+  undefined stepDown(optional long n = 1);
 
   readonly attribute boolean willValidate;
   readonly attribute ValidityState validity;
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList? labels;
 
-  void select();
+  undefined select();
   attribute unsigned long? selectionStart;
   attribute unsigned long? selectionEnd;
   attribute DOMString? selectionDirection;
-  void setRangeText(DOMString replacement);
-  void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
-  void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+  undefined setRangeText(DOMString replacement);
+  undefined setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
+  undefined setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -887,7 +950,7 @@ interface HTMLButtonElement : HTMLElement {
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 };
@@ -910,10 +973,10 @@ interface HTMLSelectElement : HTMLElement {
   [CEReactions] attribute unsigned long length;
   getter Element? item(unsigned long index);
   HTMLOptionElement? namedItem(DOMString name);
-  [CEReactions] void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
-  [CEReactions] void remove(); // ChildNode overload
-  [CEReactions] void remove(long index);
-  [CEReactions] setter void (unsigned long index, HTMLOptionElement? option);
+  [CEReactions] undefined add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
+  [CEReactions] undefined remove(); // ChildNode overload
+  [CEReactions] undefined remove(long index);
+  [CEReactions] setter undefined (unsigned long index, HTMLOptionElement? option);
 
   [SameObject] readonly attribute HTMLCollection selectedOptions;
   attribute long selectedIndex;
@@ -924,7 +987,7 @@ interface HTMLSelectElement : HTMLElement {
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 };
@@ -988,17 +1051,17 @@ interface HTMLTextAreaElement : HTMLElement {
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 
-  void select();
+  undefined select();
   attribute unsigned long selectionStart;
   attribute unsigned long selectionEnd;
   attribute DOMString selectionDirection;
-  void setRangeText(DOMString replacement);
-  void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
-  void setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
+  undefined setRangeText(DOMString replacement);
+  undefined setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional SelectionMode selectionMode = "preserve");
+  undefined setSelectionRange(unsigned long start, unsigned long end, optional DOMString direction);
 };
 
 [Exposed=Window]
@@ -1018,7 +1081,7 @@ interface HTMLOutputElement : HTMLElement {
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 
   readonly attribute NodeList labels;
 };
@@ -1063,7 +1126,7 @@ interface HTMLFieldSetElement : HTMLElement {
   readonly attribute DOMString validationMessage;
   boolean checkValidity();
   boolean reportValidity();
-  void setCustomValidity(DOMString error);
+  undefined setCustomValidity(DOMString error);
 };
 
 [Exposed=Window]
@@ -1071,6 +1134,8 @@ interface HTMLLegendElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   readonly attribute HTMLFormElement? form;
+
+  // also has obsolete members
 };
 
 enum SelectionMode {
@@ -1130,9 +1195,9 @@ interface HTMLDialogElement : HTMLElement {
 
   [CEReactions] attribute boolean open;
   attribute DOMString returnValue;
-  [CEReactions] void show();
-  [CEReactions] void showModal();
-  [CEReactions] void close(optional DOMString returnValue);
+  [CEReactions] undefined show();
+  [CEReactions] undefined showModal();
+  [CEReactions] undefined close(optional DOMString returnValue);
 };
 
 [Exposed=Window]
@@ -1149,6 +1214,7 @@ interface HTMLScriptElement : HTMLElement {
   [CEReactions] attribute DOMString integrity;
   [CEReactions] attribute DOMString referrerPolicy;
 
+  // also has obsolete members
 };
 
 [Exposed=Window]
@@ -1183,11 +1249,11 @@ interface HTMLCanvasElement : HTMLElement {
   RenderingContext? getContext(DOMString contextId, optional any options = null);
 
   USVString toDataURL(optional DOMString type = "image/png", optional any quality);
-  void toBlob(BlobCallback _callback, optional DOMString type = "image/png", optional any quality);
+  undefined toBlob(BlobCallback _callback, optional DOMString type = "image/png", optional any quality);
   OffscreenCanvas transferControlToOffscreen();
 };
 
-callback BlobCallback = void (Blob? blob);
+callback BlobCallback = undefined (Blob? blob);
 
 typedef (HTMLImageElement or
          SVGImageElement) HTMLOrSVGImageElement;
@@ -1233,21 +1299,21 @@ CanvasRenderingContext2D includes CanvasPath;
 
 interface mixin CanvasState {
   // state
-  void save(); // push state on state stack
-  void restore(); // pop state stack and restore state
+  undefined save(); // push state on state stack
+  undefined restore(); // pop state stack and restore state
 };
 
 interface mixin CanvasTransform {
   // transformations (default transform is the identity matrix)
-  void scale(unrestricted double x, unrestricted double y);
-  void rotate(unrestricted double angle);
-  void translate(unrestricted double x, unrestricted double y);
-  void transform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
+  undefined scale(unrestricted double x, unrestricted double y);
+  undefined rotate(unrestricted double angle);
+  undefined translate(unrestricted double x, unrestricted double y);
+  undefined transform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
 
   [NewObject] DOMMatrix getTransform();
-  void setTransform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
-  void setTransform(optional DOMMatrix2DInit transform = {});
-  void resetTransform();
+  undefined setTransform(unrestricted double a, unrestricted double b, unrestricted double c, unrestricted double d, unrestricted double e, unrestricted double f);
+  undefined setTransform(optional DOMMatrix2DInit transform = {});
+  undefined resetTransform();
 
 };
 
@@ -1289,20 +1355,20 @@ interface mixin CanvasFilters {
 
 interface mixin CanvasRect {
   // rects
-  void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void fillRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+  undefined clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+  undefined fillRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+  undefined strokeRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
 };
 
 interface mixin CanvasDrawPath {
   // path API (see also CanvasPath)
-  void beginPath();
-  void fill(optional CanvasFillRule fillRule = "nonzero");
-  void fill(Path2D path, optional CanvasFillRule fillRule = "nonzero");
-  void stroke();
-  void stroke(Path2D path);
-  void clip(optional CanvasFillRule fillRule = "nonzero");
-  void clip(Path2D path, optional CanvasFillRule fillRule = "nonzero");
+  undefined beginPath();
+  undefined fill(optional CanvasFillRule fillRule = "nonzero");
+  undefined fill(Path2D path, optional CanvasFillRule fillRule = "nonzero");
+  undefined stroke();
+  undefined stroke(Path2D path);
+  undefined clip(optional CanvasFillRule fillRule = "nonzero");
+  undefined clip(Path2D path, optional CanvasFillRule fillRule = "nonzero");
   boolean isPointInPath(unrestricted double x, unrestricted double y, optional CanvasFillRule fillRule = "nonzero");
   boolean isPointInPath(Path2D path, unrestricted double x, unrestricted double y, optional CanvasFillRule fillRule = "nonzero");
   boolean isPointInStroke(unrestricted double x, unrestricted double y);
@@ -1310,24 +1376,24 @@ interface mixin CanvasDrawPath {
 };
 
 interface mixin CanvasUserInterface {
-  void drawFocusIfNeeded(Element element);
-  void drawFocusIfNeeded(Path2D path, Element element);
-  void scrollPathIntoView();
-  void scrollPathIntoView(Path2D path);
+  undefined drawFocusIfNeeded(Element element);
+  undefined drawFocusIfNeeded(Path2D path, Element element);
+  undefined scrollPathIntoView();
+  undefined scrollPathIntoView(Path2D path);
 };
 
 interface mixin CanvasText {
   // text (see also the CanvasPathDrawingStyles and CanvasTextDrawingStyles interfaces)
-  void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
-  void strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+  undefined fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
+  undefined strokeText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth);
   TextMetrics measureText(DOMString text);
 };
 
 interface mixin CanvasDrawImage {
   // drawing images
-  void drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy);
-  void drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
-  void drawImage(CanvasImageSource image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
+  undefined drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy);
+  undefined drawImage(CanvasImageSource image, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
+  undefined drawImage(CanvasImageSource image, unrestricted double sx, unrestricted double sy, unrestricted double sw, unrestricted double sh, unrestricted double dx, unrestricted double dy, unrestricted double dw, unrestricted double dh);
 };
 
 interface mixin CanvasImageData {
@@ -1335,8 +1401,8 @@ interface mixin CanvasImageData {
   ImageData createImageData(long sw, long sh);
   ImageData createImageData(ImageData imagedata);
   ImageData getImageData(long sx, long sy, long sw, long sh);
-  void putImageData(ImageData imagedata, long dx, long dy);
-  void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
+  undefined putImageData(ImageData imagedata, long dx, long dy);
+  undefined putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight);
 };
 
 enum CanvasLineCap { "butt", "round", "square" };
@@ -1353,7 +1419,7 @@ interface mixin CanvasPathDrawingStyles {
   attribute unrestricted double miterLimit; // (default 10)
 
   // dashed lines
-  void setLineDash(sequence<unrestricted double> segments); // default empty
+  undefined setLineDash(sequence<unrestricted double> segments); // default empty
   sequence<unrestricted double> getLineDash();
   attribute unrestricted double lineDashOffset;
 };
@@ -1368,27 +1434,27 @@ interface mixin CanvasTextDrawingStyles {
 
 interface mixin CanvasPath {
   // shared path API methods
-  void closePath();
-  void moveTo(unrestricted double x, unrestricted double y);
-  void lineTo(unrestricted double x, unrestricted double y);
-  void quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
-  void bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
-  void arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
-  void rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
-  void arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
-  void ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+  undefined closePath();
+  undefined moveTo(unrestricted double x, unrestricted double y);
+  undefined lineTo(unrestricted double x, unrestricted double y);
+  undefined quadraticCurveTo(unrestricted double cpx, unrestricted double cpy, unrestricted double x, unrestricted double y);
+  undefined bezierCurveTo(unrestricted double cp1x, unrestricted double cp1y, unrestricted double cp2x, unrestricted double cp2y, unrestricted double x, unrestricted double y);
+  undefined arcTo(unrestricted double x1, unrestricted double y1, unrestricted double x2, unrestricted double y2, unrestricted double radius);
+  undefined rect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
+  undefined arc(unrestricted double x, unrestricted double y, unrestricted double radius, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
+  undefined ellipse(unrestricted double x, unrestricted double y, unrestricted double radiusX, unrestricted double radiusY, unrestricted double rotation, unrestricted double startAngle, unrestricted double endAngle, optional boolean anticlockwise = false);
 };
 
 [Exposed=(Window,Worker)]
 interface CanvasGradient {
   // opaque object
-  void addColorStop(double offset, DOMString color);
+  undefined addColorStop(double offset, DOMString color);
 };
 
 [Exposed=(Window,Worker)]
 interface CanvasPattern {
   // opaque object
-  void setTransform(optional DOMMatrix2DInit transform = {});
+  undefined setTransform(optional DOMMatrix2DInit transform = {});
 };
 
 [Exposed=(Window,Worker)]
@@ -1425,14 +1491,14 @@ interface ImageData {
 interface Path2D {
   constructor(optional (Path2D or DOMString) path);
 
-  void addPath(Path2D path, optional DOMMatrix2DInit transform = {});
+  undefined addPath(Path2D path, optional DOMMatrix2DInit transform = {});
 };
 Path2D includes CanvasPath;
 
 [Exposed=(Window,Worker)]
 interface ImageBitmapRenderingContext {
   readonly attribute (HTMLCanvasElement or OffscreenCanvas) canvas;
-  void transferFromImageBitmap(ImageBitmap? bitmap);
+  undefined transferFromImageBitmap(ImageBitmap? bitmap);
 };
 
 dictionary ImageBitmapRenderingContextSettings {
@@ -1462,7 +1528,7 @@ interface OffscreenCanvas : EventTarget {
 
 [Exposed=(Window,Worker)]
 interface OffscreenCanvasRenderingContext2D {
-  void commit();
+  undefined commit();
   readonly attribute OffscreenCanvas canvas;
 };
 
@@ -1484,10 +1550,10 @@ OffscreenCanvasRenderingContext2D includes CanvasPath;
 
 [Exposed=Window]
 interface CustomElementRegistry {
-  [CEReactions] void define(DOMString name, CustomElementConstructor constructor, optional ElementDefinitionOptions options = {});
-  any get(DOMString name);
-  Promise<void> whenDefined(DOMString name);
-  [CEReactions] void upgrade(Node root);
+  [CEReactions] undefined define(DOMString name, CustomElementConstructor constructor, optional ElementDefinitionOptions options = {});
+  (CustomElementConstructor or undefined) get(DOMString name);
+  Promise<CustomElementConstructor> whenDefined(DOMString name);
+  [CEReactions] undefined upgrade(Node root);
 };
 
 callback CustomElementConstructor = HTMLElement ();
@@ -1500,12 +1566,12 @@ dictionary ElementDefinitionOptions {
 interface ElementInternals {
   // Form-associated custom elements
 
-  void setFormValue((File or USVString or FormData)? value,
+  undefined setFormValue((File or USVString or FormData)? value,
                     optional (File or USVString or FormData)? state);
 
   readonly attribute HTMLFormElement? form;
 
-  void setValidity(optional ValidityStateFlags flags = {},
+  undefined setValidity(optional ValidityStateFlags flags = {},
                    optional DOMString message,
                    optional HTMLElement anchor);
   readonly attribute boolean willValidate;
@@ -1541,21 +1607,22 @@ interface mixin ElementContentEditable {
   [CEReactions] attribute DOMString inputMode;
 };
 
-[Exposed=Window,
- Constructor]
+[Exposed=Window]
 interface DataTransfer {
+  constructor();
+
   attribute DOMString dropEffect;
   attribute DOMString effectAllowed;
 
   [SameObject] readonly attribute DataTransferItemList items;
 
-  void setDragImage(Element image, long x, long y);
+  undefined setDragImage(Element image, long x, long y);
 
   /* old interface */
   readonly attribute FrozenArray<DOMString> types;
   DOMString getData(DOMString format);
-  void setData(DOMString format, DOMString data);
-  void clearData(optional DOMString format);
+  undefined setData(DOMString format, DOMString data);
+  undefined clearData(optional DOMString format);
   [SameObject] readonly attribute FileList files;
 };
 
@@ -1565,23 +1632,24 @@ interface DataTransferItemList {
   getter DataTransferItem (unsigned long index);
   DataTransferItem? add(DOMString data, DOMString type);
   DataTransferItem? add(File data);
-  void remove(unsigned long index);
-  void clear();
+  undefined remove(unsigned long index);
+  undefined clear();
 };
 
 [Exposed=Window]
 interface DataTransferItem {
   readonly attribute DOMString kind;
   readonly attribute DOMString type;
-  void getAsString(FunctionStringCallback? _callback);
+  undefined getAsString(FunctionStringCallback? _callback);
   File? getAsFile();
 };
 
-callback FunctionStringCallback = void (DOMString data);
+callback FunctionStringCallback = undefined (DOMString data);
 
-[Exposed=Window,
- Constructor(DOMString type, optional DragEventInit eventInitDict = {})]
+[Exposed=Window]
 interface DragEvent : MouseEvent {
+  constructor(DOMString type, optional DragEventInit eventInitDict = {});
+
   readonly attribute DataTransfer? dataTransfer;
 };
 
@@ -1608,11 +1676,11 @@ interface Window : EventTarget {
   [Replaceable] readonly attribute BarProp statusbar;
   [Replaceable] readonly attribute BarProp toolbar;
   attribute DOMString status;
-  void close();
+  undefined close();
   readonly attribute boolean closed;
-  void stop();
-  void focus();
-  void blur();
+  undefined stop();
+  undefined focus();
+  undefined blur();
 
   // other browsing contexts
   [Replaceable] readonly attribute WindowProxy frames;
@@ -1630,16 +1698,19 @@ interface Window : EventTarget {
   // the user agent
   readonly attribute Navigator navigator;
   [SecureContext] readonly attribute ApplicationCache applicationCache;
+  readonly attribute boolean originIsolated;
 
   // user prompts
-  void alert();
-  void alert(DOMString message);
+  undefined alert();
+  undefined alert(DOMString message);
   boolean confirm(optional DOMString message = "");
   DOMString? prompt(optional DOMString message = "", optional DOMString default = "");
-  void print();
+  undefined print();
 
-  void postMessage(any message, USVString targetOrigin, optional sequence<object> transfer = []);
-  void postMessage(any message, optional WindowPostMessageOptions options = {});
+  undefined postMessage(any message, USVString targetOrigin, optional sequence<object> transfer = []);
+  undefined postMessage(any message, optional WindowPostMessageOptions options = {});
+
+  // also has obsolete members
 };
 Window includes GlobalEventHandlers;
 Window includes WindowEventHandlers;
@@ -1660,11 +1731,11 @@ interface History {
   readonly attribute unsigned long length;
   attribute ScrollRestoration scrollRestoration;
   readonly attribute any state;
-  void go(optional long delta = 0);
-  void back();
-  void forward();
-  void pushState(any data, DOMString title, optional USVString? url = null);
-  void replaceState(any data, DOMString title, optional USVString? url = null);
+  undefined go(optional long delta = 0);
+  undefined back();
+  undefined forward();
+  undefined pushState(any data, DOMString title, optional USVString? url = null);
+  undefined replaceState(any data, DOMString title, optional USVString? url = null);
 };
 
 [Exposed=Window]
@@ -1679,16 +1750,17 @@ interface Location { // but see also additional creation steps and overridden in
   [LegacyUnforgeable] attribute USVString search;
   [LegacyUnforgeable] attribute USVString hash;
 
-  [LegacyUnforgeable] void assign(USVString url);
-  [LegacyUnforgeable] void replace(USVString url);
-  [LegacyUnforgeable] void reload();
+  [LegacyUnforgeable] undefined assign(USVString url);
+  [LegacyUnforgeable] undefined replace(USVString url);
+  [LegacyUnforgeable] undefined reload();
 
   [LegacyUnforgeable, SameObject] readonly attribute DOMStringList ancestorOrigins;
 };
 
-[Exposed=Window,
- Constructor(DOMString type, optional PopStateEventInit eventInitDict = {})]
+[Exposed=Window]
 interface PopStateEvent : Event {
+  constructor(DOMString type, optional PopStateEventInit eventInitDict = {});
+
   readonly attribute any state;
 };
 
@@ -1696,9 +1768,10 @@ dictionary PopStateEventInit : EventInit {
   any state = null;
 };
 
-[Exposed=Window,
- Constructor(DOMString type, optional HashChangeEventInit eventInitDict = {})]
+[Exposed=Window]
 interface HashChangeEvent : Event {
+  constructor(DOMString type, optional HashChangeEventInit eventInitDict = {});
+
   readonly attribute USVString oldURL;
   readonly attribute USVString newURL;
 };
@@ -1708,9 +1781,10 @@ dictionary HashChangeEventInit : EventInit {
   USVString newURL = "";
 };
 
-[Exposed=Window,
- Constructor(DOMString type, optional PageTransitionEventInit eventInitDict = {})]
+[Exposed=Window]
 interface PageTransitionEvent : Event {
+  constructor(DOMString type, optional PageTransitionEventInit eventInitDict = {});
+
   readonly attribute boolean persisted;
 };
 
@@ -1737,9 +1811,9 @@ interface ApplicationCache : EventTarget {
   readonly attribute unsigned short status;
 
   // updates
-  void update();
-  void abort();
-  void swapCache();
+  undefined update();
+  undefined abort();
+  undefined swapCache();
 
   // events
   attribute EventHandler onchecking;
@@ -1816,7 +1890,6 @@ interface mixin GlobalEventHandlers {
   attribute EventHandler ondrag;
   attribute EventHandler ondragend;
   attribute EventHandler ondragenter;
-  attribute EventHandler ondragexit;
   attribute EventHandler ondragleave;
   attribute EventHandler ondragover;
   attribute EventHandler ondragstart;
@@ -1899,6 +1972,8 @@ typedef (DOMString or Function) TimerHandler;
 
 interface mixin WindowOrWorkerGlobalScope {
   [Replaceable] readonly attribute USVString origin;
+  readonly attribute boolean isSecureContext;
+  readonly attribute boolean crossOriginIsolated;
 
   // base64 utility methods
   DOMString btoa(DOMString data);
@@ -1906,12 +1981,12 @@ interface mixin WindowOrWorkerGlobalScope {
 
   // timers
   long setTimeout(TimerHandler handler, optional long timeout = 0, any... arguments);
-  void clearTimeout(optional long handle = 0);
+  undefined clearTimeout(optional long handle = 0);
   long setInterval(TimerHandler handler, optional long timeout = 0, any... arguments);
-  void clearInterval(optional long handle = 0);
+  undefined clearInterval(optional long handle = 0);
 
   // microtask queuing
-  void queueMicrotask(VoidFunction callback);
+  undefined queueMicrotask(VoidFunction callback);
 
   // ImageBitmap
   Promise<ImageBitmap> createImageBitmap(ImageBitmapSource image, optional ImageBitmapOptions options = {});
@@ -1970,8 +2045,8 @@ interface mixin NavigatorLanguage {
 };
 
 interface mixin NavigatorContentUtils {
-  [SecureContext] void registerProtocolHandler(DOMString scheme, USVString url);
-  [SecureContext] void unregisterProtocolHandler(DOMString scheme, USVString url);
+  [SecureContext] undefined registerProtocolHandler(DOMString scheme, USVString url);
+  [SecureContext] undefined unregisterProtocolHandler(DOMString scheme, USVString url);
 };
 
 interface mixin NavigatorCookies {
@@ -1987,7 +2062,7 @@ interface mixin NavigatorPlugins {
 [Exposed=Window,
  LegacyUnenumerableNamedProperties]
 interface PluginArray {
-  void refresh(optional boolean reload = false);
+  undefined refresh(optional boolean reload = false);
   readonly attribute unsigned long length;
   getter Plugin? item(unsigned long index);
   getter Plugin? namedItem(DOMString name);
@@ -2024,7 +2099,7 @@ interface MimeType {
 interface ImageBitmap {
   readonly attribute unsigned long width;
   readonly attribute unsigned long height;
-  void close();
+  undefined close();
 };
 
 typedef (CanvasImageSource or
@@ -2045,11 +2120,11 @@ dictionary ImageBitmapOptions {
   ResizeQuality resizeQuality = "low";
 };
 
-callback FrameRequestCallback = void (DOMHighResTimeStamp time);
+callback FrameRequestCallback = undefined (DOMHighResTimeStamp time);
 
 interface mixin AnimationFrameProvider {
   unsigned long requestAnimationFrame(FrameRequestCallback callback);
-  void cancelAnimationFrame(unsigned long handle);
+  undefined cancelAnimationFrame(unsigned long handle);
 };
 Window includes AnimationFrameProvider;
 DedicatedWorkerGlobalScope includes AnimationFrameProvider;
@@ -2064,7 +2139,7 @@ interface MessageEvent : Event {
   readonly attribute MessageEventSource? source;
   readonly attribute FrozenArray<MessagePort> ports;
 
-  void initMessageEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any data = null, optional USVString origin = "", optional DOMString lastEventId = "", optional MessageEventSource? source = null, optional sequence<MessagePort> ports = []);
+  undefined initMessageEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any data = null, optional USVString origin = "", optional DOMString lastEventId = "", optional MessageEventSource? source = null, optional sequence<MessagePort> ports = []);
 };
 
 dictionary MessageEventInit : EventInit {
@@ -2094,7 +2169,7 @@ interface EventSource : EventTarget {
   attribute EventHandler onopen;
   attribute EventHandler onmessage;
   attribute EventHandler onerror;
-  void close();
+  undefined close();
 };
 
 dictionary EventSourceInit {
@@ -2122,15 +2197,15 @@ interface WebSocket : EventTarget {
   attribute EventHandler onclose;
   readonly attribute DOMString extensions;
   readonly attribute DOMString protocol;
-  void close(optional [Clamp] unsigned short code, optional USVString reason);
+  undefined close(optional [Clamp] unsigned short code, optional USVString reason);
 
   // messaging
   attribute EventHandler onmessage;
   attribute BinaryType binaryType;
-  void send(USVString data);
-  void send(Blob data);
-  void send(ArrayBuffer data);
-  void send(ArrayBufferView data);
+  undefined send(USVString data);
+  undefined send(Blob data);
+  undefined send(ArrayBuffer data);
+  undefined send(ArrayBufferView data);
 };
 
 [Exposed=(Window,Worker)]
@@ -2148,18 +2223,20 @@ dictionary CloseEventInit : EventInit {
   USVString reason = "";
 };
 
-[Constructor, Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface MessageChannel {
+  constructor();
+
   readonly attribute MessagePort port1;
   readonly attribute MessagePort port2;
 };
 
 [Exposed=(Window,Worker,AudioWorklet), Transferable]
 interface MessagePort : EventTarget {
-  void postMessage(any message, sequence<object> transfer);
-  void postMessage(any message, optional PostMessageOptions options = {});
-  void start();
-  void close();
+  undefined postMessage(any message, sequence<object> transfer);
+  undefined postMessage(any message, optional PostMessageOptions options = {});
+  undefined start();
+  undefined close();
 
   // event handlers
   attribute EventHandler onmessage;
@@ -2175,8 +2252,8 @@ interface BroadcastChannel : EventTarget {
   constructor(DOMString name);
 
   readonly attribute DOMString name;
-  void postMessage(any message);
-  void close();
+  undefined postMessage(any message);
+  undefined close();
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
 };
@@ -2186,7 +2263,7 @@ interface WorkerGlobalScope : EventTarget {
   readonly attribute WorkerGlobalScope self;
   readonly attribute WorkerLocation location;
   readonly attribute WorkerNavigator navigator;
-  void importScripts(USVString... urls);
+  undefined importScripts(USVString... urls);
 
   attribute OnErrorEventHandler onerror;
   attribute EventHandler onlanguagechange;
@@ -2200,10 +2277,10 @@ interface WorkerGlobalScope : EventTarget {
 interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
   [Replaceable] readonly attribute DOMString name;
 
-  void postMessage(any message, sequence<object> transfer);
-  void postMessage(any message, optional PostMessageOptions options = {});
+  undefined postMessage(any message, sequence<object> transfer);
+  undefined postMessage(any message, optional PostMessageOptions options = {});
 
-  void close();
+  undefined close();
 
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
@@ -2213,7 +2290,7 @@ interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
 interface SharedWorkerGlobalScope : WorkerGlobalScope {
   [Replaceable] readonly attribute DOMString name;
 
-  void close();
+  undefined close();
 
   attribute EventHandler onconnect;
 };
@@ -2222,14 +2299,14 @@ interface mixin AbstractWorker {
   attribute EventHandler onerror;
 };
 
-[Exposed=(Window,Worker)]
+[Exposed=(Window,DedicatedWorker,SharedWorker)]
 interface Worker : EventTarget {
   constructor(USVString scriptURL, optional WorkerOptions options = {});
 
-  void terminate();
+  undefined terminate();
 
-  void postMessage(any message, sequence<object> transfer);
-  void postMessage(any message, optional PostMessageOptions options = {});
+  undefined postMessage(any message, sequence<object> transfer);
+  undefined postMessage(any message, optional PostMessageOptions options = {});
   attribute EventHandler onmessage;
   attribute EventHandler onmessageerror;
 };
@@ -2244,7 +2321,7 @@ enum WorkerType { "classic", "module" };
 
 Worker includes AbstractWorker;
 
-[Exposed=(Window,Worker)]
+[Exposed=Window]
 interface SharedWorker : EventTarget {
   constructor(USVString scriptURL, optional (DOMString or WorkerOptions) options = {});
 
@@ -2281,9 +2358,9 @@ interface Storage {
   readonly attribute unsigned long length;
   DOMString? key(unsigned long index);
   getter DOMString? getItem(DOMString key);
-  setter void setItem(DOMString key, DOMString value);
-  deleter void removeItem(DOMString key);
-  void clear();
+  setter undefined setItem(DOMString key, DOMString value);
+  deleter undefined removeItem(DOMString key);
+  undefined clear();
 };
 
 interface mixin WindowSessionStorage {
@@ -2296,16 +2373,17 @@ interface mixin WindowLocalStorage {
 };
 Window includes WindowLocalStorage;
 
-[Exposed=Window,
- Constructor(DOMString type, optional StorageEventInit eventInitDict = {})]
+[Exposed=Window]
 interface StorageEvent : Event {
+  constructor(DOMString type, optional StorageEventInit eventInitDict = {});
+
   readonly attribute DOMString? key;
   readonly attribute DOMString? oldValue;
   readonly attribute DOMString? newValue;
   readonly attribute USVString url;
   readonly attribute Storage? storageArea;
 
-  void initStorageEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional DOMString? key = null, optional DOMString? oldValue = null, optional DOMString? newValue = null, optional USVString url = "", optional Storage? storageArea = null);
+  undefined initStorageEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional DOMString? key = null, optional DOMString? oldValue = null, optional DOMString? newValue = null, optional USVString url = "", optional Storage? storageArea = null);
 };
 
 dictionary StorageEventInit : EventInit {
@@ -2336,8 +2414,8 @@ interface HTMLMarqueeElement : HTMLElement {
   attribute EventHandler onfinish;
   attribute EventHandler onstart;
 
-  void start();
-  void stop();
+  undefined start();
+  undefined stop();
 };
 
 [Exposed=Window]
@@ -2595,22 +2673,22 @@ partial interface Document {
   [SameObject] readonly attribute HTMLCollection anchors;
   [SameObject] readonly attribute HTMLCollection applets;
 
-  void clear();
-  void captureEvents();
-  void releaseEvents();
+  undefined clear();
+  undefined captureEvents();
+  undefined releaseEvents();
 
   [SameObject] readonly attribute HTMLAllCollection all;
 };
 
 partial interface Window {
-  void captureEvents();
-  void releaseEvents();
+  undefined captureEvents();
+  undefined releaseEvents();
 
   [Replaceable, SameObject] readonly attribute External external;
 };
 
 [Exposed=Window]
 interface External {
-  void AddSearchProvider();
-  void IsSearchProviderInstalled();
+  undefined AddSearchProvider();
+  undefined IsSearchProviderInstalled();
 };
diff --git a/tests/wpt/web-platform-tests/idle-detection/idle-detection.idl b/tests/wpt/web-platform-tests/interfaces/idle-detection.tentative.idl
similarity index 100%
rename from tests/wpt/web-platform-tests/idle-detection/idle-detection.idl
rename to tests/wpt/web-platform-tests/interfaces/idle-detection.tentative.idl
diff --git a/tests/wpt/web-platform-tests/interfaces/image-capture.idl b/tests/wpt/web-platform-tests/interfaces/image-capture.idl
index f4ad3705f04..f98912cb6a1 100644
--- a/tests/wpt/web-platform-tests/interfaces/image-capture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/image-capture.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: MediaStream Image Capture (https://w3c.github.io/mediacapture-image/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl b/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl
index 36fdbd21c42..72d91de2fcd 100644
--- a/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl
+++ b/tests/wpt/web-platform-tests/interfaces/input-device-capabilities.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Input Device Capabilities (https://wicg.github.io/input-device-capabilities/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/input-events.idl b/tests/wpt/web-platform-tests/interfaces/input-events.idl
index 5ddaae5b9d3..6a2147b93e6 100644
--- a/tests/wpt/web-platform-tests/interfaces/input-events.idl
+++ b/tests/wpt/web-platform-tests/interfaces/input-events.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Input Events Level 2 (https://w3c.github.io/input-events/)
 
 partial interface InputEvent {
diff --git a/tests/wpt/web-platform-tests/interfaces/intersection-observer.idl b/tests/wpt/web-platform-tests/interfaces/intersection-observer.idl
index 46fad3522ed..fa1de190387 100644
--- a/tests/wpt/web-platform-tests/interfaces/intersection-observer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/intersection-observer.idl
@@ -1,9 +1,9 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Intersection Observer (https://w3c.github.io/IntersectionObserver/)
 
-callback IntersectionObserverCallback = void (sequence<IntersectionObserverEntry> entries, IntersectionObserver observer);
+callback IntersectionObserverCallback = undefined (sequence<IntersectionObserverEntry> entries, IntersectionObserver observer);
 
 [Exposed=Window]
 interface IntersectionObserver {
@@ -11,9 +11,9 @@ interface IntersectionObserver {
   readonly attribute Node? root;
   readonly attribute DOMString rootMargin;
   readonly attribute FrozenArray<double> thresholds;
-  void observe(Element target);
-  void unobserve(Element target);
-  void disconnect();
+  undefined observe(Element target);
+  undefined unobserve(Element target);
+  undefined disconnect();
   sequence<IntersectionObserverEntry> takeRecords();
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/intervention-reporting.idl b/tests/wpt/web-platform-tests/interfaces/intervention-reporting.idl
index 95905fe3b58..3c3b8001e74 100644
--- a/tests/wpt/web-platform-tests/interfaces/intervention-reporting.idl
+++ b/tests/wpt/web-platform-tests/interfaces/intervention-reporting.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Intervention Reporting (https://wicg.github.io/intervention-reporting/)
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/is-input-pending.idl b/tests/wpt/web-platform-tests/interfaces/is-input-pending.idl
index 191fafdb96c..a0314781bb1 100644
--- a/tests/wpt/web-platform-tests/interfaces/is-input-pending.idl
+++ b/tests/wpt/web-platform-tests/interfaces/is-input-pending.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Early detection of input events (https://wicg.github.io/is-input-pending/)
 
 dictionary IsInputPendingOptionsInit {
diff --git a/tests/wpt/web-platform-tests/interfaces/js-self-profiling.idl b/tests/wpt/web-platform-tests/interfaces/js-self-profiling.idl
index 0153e652360..2c51c1cfe8e 100644
--- a/tests/wpt/web-platform-tests/interfaces/js-self-profiling.idl
+++ b/tests/wpt/web-platform-tests/interfaces/js-self-profiling.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: JS Self-Profiling API (https://wicg.github.io/js-self-profiling/)
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/keyboard-lock.idl b/tests/wpt/web-platform-tests/interfaces/keyboard-lock.idl
index 5990976c1c8..1eb2e97e270 100644
--- a/tests/wpt/web-platform-tests/interfaces/keyboard-lock.idl
+++ b/tests/wpt/web-platform-tests/interfaces/keyboard-lock.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Keyboard Lock (https://wicg.github.io/keyboard-lock/)
 
 partial interface Navigator {
diff --git a/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl b/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl
index 70aaaffd3cf..8d95d885058 100644
--- a/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl
+++ b/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Keyboard Map (https://wicg.github.io/keyboard-map/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/largest-contentful-paint.idl b/tests/wpt/web-platform-tests/interfaces/largest-contentful-paint.idl
index d3cfd56bafd..99de275cfd3 100644
--- a/tests/wpt/web-platform-tests/interfaces/largest-contentful-paint.idl
+++ b/tests/wpt/web-platform-tests/interfaces/largest-contentful-paint.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Largest Contentful Paint (https://wicg.github.io/largest-contentful-paint/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/layout-instability.idl b/tests/wpt/web-platform-tests/interfaces/layout-instability.idl
index 3ee0afa0610..4fb1b70398e 100644
--- a/tests/wpt/web-platform-tests/interfaces/layout-instability.idl
+++ b/tests/wpt/web-platform-tests/interfaces/layout-instability.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Layout Instability API (https://wicg.github.io/layout-instability/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/longtasks.idl b/tests/wpt/web-platform-tests/interfaces/longtasks.idl
index ef3f660038b..6ceb0e5d8f0 100644
--- a/tests/wpt/web-platform-tests/interfaces/longtasks.idl
+++ b/tests/wpt/web-platform-tests/interfaces/longtasks.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Long Tasks API 1 (https://w3c.github.io/longtasks/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/magnetometer.idl b/tests/wpt/web-platform-tests/interfaces/magnetometer.idl
index da1f22bb668..45ba9edcfe5 100644
--- a/tests/wpt/web-platform-tests/interfaces/magnetometer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/magnetometer.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Magnetometer (https://w3c.github.io/magnetometer/)
 
 [SecureContext,
diff --git a/tests/wpt/web-platform-tests/interfaces/media-capabilities.idl b/tests/wpt/web-platform-tests/interfaces/media-capabilities.idl
index 02aa140bc08..fb52b7c417c 100644
--- a/tests/wpt/web-platform-tests/interfaces/media-capabilities.idl
+++ b/tests/wpt/web-platform-tests/interfaces/media-capabilities.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Capabilities (https://w3c.github.io/media-capabilities/)
 
 dictionary MediaConfiguration {
diff --git a/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl b/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl
index c3ee5237e4c..f73d8dbd598 100644
--- a/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl
+++ b/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Playback Quality (https://w3c.github.io/media-playback-quality/)
 
 partial interface HTMLVideoElement {
diff --git a/tests/wpt/web-platform-tests/interfaces/media-source.idl b/tests/wpt/web-platform-tests/interfaces/media-source.idl
index e6ff4cd6ac3..51eccd906e7 100644
--- a/tests/wpt/web-platform-tests/interfaces/media-source.idl
+++ b/tests/wpt/web-platform-tests/interfaces/media-source.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Source Extensionsâ„¢ (https://w3c.github.io/media-source/)
 
 enum ReadyState {
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl
index 4d7459bf207..dcf3c3659d9 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Capture Depth Stream Extensions (https://w3c.github.io/mediacapture-depth/)
 
 partial dictionary MediaTrackSupportedConstraints {
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl
index 7e119095095..b25f87018df 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Capture from DOM Elements (https://w3c.github.io/mediacapture-fromelement/)
 
 partial interface HTMLMediaElement {
@@ -13,5 +13,5 @@ partial interface HTMLCanvasElement {
 
 [Exposed=Window] interface CanvasCaptureMediaStreamTrack : MediaStreamTrack {
     readonly        attribute HTMLCanvasElement canvas;
-    void requestFrame ();
+    undefined requestFrame ();
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
index e82bf36f3d7..5532cf64671 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-streams.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Capture and Streams (https://w3c.github.io/mediacapture-main/)
 
 [Exposed=Window]
@@ -13,8 +13,8 @@ interface MediaStream : EventTarget {
   sequence<MediaStreamTrack> getVideoTracks();
   sequence<MediaStreamTrack> getTracks();
   MediaStreamTrack? getTrackById(DOMString trackId);
-  void addTrack(MediaStreamTrack track);
-  void removeTrack(MediaStreamTrack track);
+  undefined addTrack(MediaStreamTrack track);
+  undefined removeTrack(MediaStreamTrack track);
   MediaStream clone();
   readonly attribute boolean active;
   attribute EventHandler onaddtrack;
@@ -33,11 +33,11 @@ interface MediaStreamTrack : EventTarget {
   readonly attribute MediaStreamTrackState readyState;
   attribute EventHandler onended;
   MediaStreamTrack clone();
-  void stop();
+  undefined stop();
   MediaTrackCapabilities getCapabilities();
   MediaTrackConstraints getConstraints();
   MediaTrackSettings getSettings();
-  Promise<void> applyConstraints(optional MediaTrackConstraints constraints = {});
+  Promise<undefined> applyConstraints(optional MediaTrackConstraints constraints = {});
 };
 
 enum MediaStreamTrackState {
@@ -174,7 +174,7 @@ interface InputDeviceInfo : MediaDeviceInfo {
 };
 
 partial interface Navigator {
-  [SecureContext] void getUserMedia(MediaStreamConstraints constraints,
+  [SecureContext] undefined getUserMedia(MediaStreamConstraints constraints,
                                     NavigatorUserMediaSuccessCallback successCallback,
                                     NavigatorUserMediaErrorCallback errorCallback);
 };
@@ -189,9 +189,9 @@ dictionary MediaStreamConstraints {
   (boolean or MediaTrackConstraints) audio = false;
 };
 
-callback NavigatorUserMediaSuccessCallback = void (MediaStream stream);
+callback NavigatorUserMediaSuccessCallback = undefined (MediaStream stream);
 
-callback NavigatorUserMediaErrorCallback = void (MediaStreamError error);
+callback NavigatorUserMediaErrorCallback = undefined (MediaStreamError error);
 
 typedef object MediaStreamError;
 
diff --git a/tests/wpt/web-platform-tests/interfaces/mediasession.idl b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
index 059d1ec8cf1..c2b2e0589e1 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediasession.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediasession.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Media Session Standard (https://w3c.github.io/mediasession/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl b/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl
index 52295125da6..c5347959383 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediastream-recording.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: MediaStream Recording (https://w3c.github.io/mediacapture-record/)
 
 [Exposed=Window,
diff --git a/tests/wpt/web-platform-tests/interfaces/mst-content-hint.idl b/tests/wpt/web-platform-tests/interfaces/mst-content-hint.idl
index f7d3f20e723..a41abb55eae 100644
--- a/tests/wpt/web-platform-tests/interfaces/mst-content-hint.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mst-content-hint.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: MediaStreamTrack Content Hints (https://w3c.github.io/mst-content-hint/)
 
 partial interface MediaStreamTrack {
diff --git a/tests/wpt/web-platform-tests/interfaces/native-file-system.idl b/tests/wpt/web-platform-tests/interfaces/native-file-system.idl
index 1fd2cb8b3a1..92ca66c82e0 100644
--- a/tests/wpt/web-platform-tests/interfaces/native-file-system.idl
+++ b/tests/wpt/web-platform-tests/interfaces/native-file-system.idl
@@ -1,10 +1,20 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Native File System (https://wicg.github.io/native-file-system/)
 
+enum FileSystemPermissionMode {
+  "read",
+  "readwrite"
+};
+
+dictionary FileSystemPermissionDescriptor : PermissionDescriptor {
+  required FileSystemHandle handle;
+  FileSystemPermissionMode mode = "read";
+};
+
 dictionary FileSystemHandlePermissionDescriptor {
-  boolean writable = false;
+  FileSystemPermissionMode mode = "read";
 };
 
 enum FileSystemHandleKind {
@@ -52,7 +62,7 @@ interface FileSystemDirectoryHandle : FileSystemHandle {
   Promise<FileSystemFileHandle> getFileHandle(USVString name, optional FileSystemGetFileOptions options = {});
   Promise<FileSystemDirectoryHandle> getDirectoryHandle(USVString name, optional FileSystemGetDirectoryOptions options = {});
 
-  Promise<void> removeEntry(USVString name, optional FileSystemRemoveOptions options = {});
+  Promise<undefined> removeEntry(USVString name, optional FileSystemRemoveOptions options = {});
 
   Promise<sequence<USVString>?> resolve(FileSystemHandle possibleDescendant);
 };
@@ -74,14 +84,14 @@ typedef (BufferSource or Blob or USVString or WriteParams) FileSystemWriteChunkT
 
 [Exposed=(Window,Worker), SecureContext]
 interface FileSystemWritableFileStream : WritableStream {
-  Promise<void> write(FileSystemWriteChunkType data);
-  Promise<void> seek(unsigned long long position);
-  Promise<void> truncate(unsigned long long size);
+  Promise<undefined> write(FileSystemWriteChunkType data);
+  Promise<undefined> seek(unsigned long long position);
+  Promise<undefined> truncate(unsigned long long size);
 };
 
 dictionary FilePickerAcceptType {
     USVString description;
-    record<USVString, sequence<USVString>> accept;
+    record<USVString, (USVString or sequence<USVString>)> accept;
 };
 
 dictionary FilePickerOptions {
@@ -106,7 +116,11 @@ partial interface Window {
     Promise<FileSystemDirectoryHandle> showDirectoryPicker(optional DirectoryPickerOptions options = {});
 };
 
-[SecureContext]
-partial interface mixin WindowOrWorkerGlobalScope {
-  Promise<FileSystemDirectoryHandle> getOriginPrivateDirectory();
+partial interface DataTransferItem {
+    Promise<FileSystemHandle?> getAsFileSystemHandle();
+};
+
+[SecureContext]
+partial interface StorageManager {
+  Promise<FileSystemDirectoryHandle> getDirectory();
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl b/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl
index 57cea306d9e..9b0f7842317 100644
--- a/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Navigation Timing Level 2 (https://w3c.github.io/navigation-timing/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/netinfo.idl b/tests/wpt/web-platform-tests/interfaces/netinfo.idl
index 530deb998c4..ac5265dbebc 100644
--- a/tests/wpt/web-platform-tests/interfaces/netinfo.idl
+++ b/tests/wpt/web-platform-tests/interfaces/netinfo.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Network Information API (https://wicg.github.io/netinfo/)
 
 enum ConnectionType {
diff --git a/tests/wpt/web-platform-tests/interfaces/notifications.idl b/tests/wpt/web-platform-tests/interfaces/notifications.idl
index d79e9076c81..f0488cf8455 100644
--- a/tests/wpt/web-platform-tests/interfaces/notifications.idl
+++ b/tests/wpt/web-platform-tests/interfaces/notifications.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Notifications API Standard (https://notifications.spec.whatwg.org/)
 
 [Exposed=(Window,Worker)]
@@ -33,7 +33,7 @@ interface Notification : EventTarget {
   [SameObject] readonly attribute any data;
   [SameObject] readonly attribute FrozenArray<NotificationAction> actions;
 
-  void close();
+  undefined close();
 };
 
 dictionary NotificationOptions {
@@ -71,14 +71,14 @@ dictionary NotificationAction {
   USVString icon;
 };
 
-callback NotificationPermissionCallback = void (NotificationPermission permission);
+callback NotificationPermissionCallback = undefined (NotificationPermission permission);
 
 dictionary GetNotificationOptions {
   DOMString tag = "";
 };
 
 partial interface ServiceWorkerRegistration {
-  Promise<void> showNotification(DOMString title, optional NotificationOptions options = {});
+  Promise<undefined> showNotification(DOMString title, optional NotificationOptions options = {});
   Promise<sequence<Notification>> getNotifications(optional GetNotificationOptions filter = {});
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/orientation-event.idl b/tests/wpt/web-platform-tests/interfaces/orientation-event.idl
index af5bc546ac1..4cd4356d2bb 100644
--- a/tests/wpt/web-platform-tests/interfaces/orientation-event.idl
+++ b/tests/wpt/web-platform-tests/interfaces/orientation-event.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: DeviceOrientation Event Specification (https://w3c.github.io/deviceorientation/)
 
 partial interface Window {
diff --git a/tests/wpt/web-platform-tests/interfaces/orientation-sensor.idl b/tests/wpt/web-platform-tests/interfaces/orientation-sensor.idl
index 2ea3d38240e..5172c87cd4e 100644
--- a/tests/wpt/web-platform-tests/interfaces/orientation-sensor.idl
+++ b/tests/wpt/web-platform-tests/interfaces/orientation-sensor.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Orientation Sensor (https://w3c.github.io/orientation-sensor/)
 
 typedef (Float32Array or Float64Array or DOMMatrix) RotationMatrixType;
@@ -8,7 +8,7 @@ typedef (Float32Array or Float64Array or DOMMatrix) RotationMatrixType;
 [SecureContext, Exposed=Window]
 interface OrientationSensor : Sensor {
   readonly attribute FrozenArray<double>? quaternion;
-  void populateMatrix(RotationMatrixType targetMatrix);
+  undefined populateMatrix(RotationMatrixType targetMatrix);
 };
 
 enum OrientationSensorLocalCoordinateSystem { "device", "screen" };
diff --git a/tests/wpt/web-platform-tests/interfaces/origin-policy.idl b/tests/wpt/web-platform-tests/interfaces/origin-policy.idl
index e48e0632bd8..0820e2ee567 100644
--- a/tests/wpt/web-platform-tests/interfaces/origin-policy.idl
+++ b/tests/wpt/web-platform-tests/interfaces/origin-policy.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Origin Policy (https://wicg.github.io/origin-policy/)
 
 partial interface mixin WindowOrWorkerGlobalScope {
diff --git a/tests/wpt/web-platform-tests/interfaces/page-lifecycle.idl b/tests/wpt/web-platform-tests/interfaces/page-lifecycle.idl
index f3d9c1f3f56..26de11c23d0 100644
--- a/tests/wpt/web-platform-tests/interfaces/page-lifecycle.idl
+++ b/tests/wpt/web-platform-tests/interfaces/page-lifecycle.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Page Lifecycle (https://wicg.github.io/page-lifecycle/)
 
 partial interface Document {
diff --git a/tests/wpt/web-platform-tests/interfaces/page-visibility.idl b/tests/wpt/web-platform-tests/interfaces/page-visibility.idl
index 6b8bd52a047..1c638f34303 100644
--- a/tests/wpt/web-platform-tests/interfaces/page-visibility.idl
+++ b/tests/wpt/web-platform-tests/interfaces/page-visibility.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Page Visibility Level 2 (https://w3c.github.io/page-visibility/)
 
 enum VisibilityState {
diff --git a/tests/wpt/web-platform-tests/interfaces/paint-timing.idl b/tests/wpt/web-platform-tests/interfaces/paint-timing.idl
index 0bfb422f888..052b74ef6c2 100644
--- a/tests/wpt/web-platform-tests/interfaces/paint-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/paint-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Paint Timing 1 (https://w3c.github.io/paint-timing/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl b/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
index 66732945ca6..259549a503d 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Payment Handler API (https://w3c.github.io/payment-handler/)
 
 partial interface ServiceWorkerRegistration {
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl b/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl
index 72e0555066c..813fc6eabf9 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-method-basic-card.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Payment Method: Basic Card (https://w3c.github.io/payment-method-basic-card/)
 
 dictionary BasicCardRequest {
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-request.idl b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
index 9407c711e48..91aab8f112b 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-request.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Payment Request API (https://w3c.github.io/payment-request/)
 
 [SecureContext, Exposed=Window]
@@ -13,7 +13,7 @@ interface PaymentRequest : EventTarget {
   [NewObject]
   Promise<PaymentResponse> show(optional Promise<PaymentDetailsUpdate> detailsPromise);
   [NewObject]
-  Promise<void> abort();
+  Promise<undefined> abort();
   [NewObject]
   Promise<boolean> canMakePayment();
   [NewObject]
@@ -155,9 +155,9 @@ interface PaymentResponse : EventTarget  {
   readonly attribute DOMString? payerPhone;
 
   [NewObject]
-  Promise<void> complete(optional PaymentComplete result = "unknown");
+  Promise<undefined> complete(optional PaymentComplete result = "unknown");
   [NewObject]
-  Promise<void> retry(optional PaymentValidationErrors errorFields = {});
+  Promise<undefined> retry(optional PaymentValidationErrors errorFields = {});
 
   attribute EventHandler onpayerdetailchange;
 };
@@ -180,7 +180,7 @@ interface MerchantValidationEvent : Event {
   constructor(DOMString type, optional MerchantValidationEventInit eventInitDict = {});
   readonly attribute DOMString methodName;
   readonly attribute USVString validationURL;
-  void complete(Promise<any> merchantSessionPromise);
+  undefined complete(Promise<any> merchantSessionPromise);
 };
 
 dictionary MerchantValidationEventInit : EventInit {
@@ -203,7 +203,7 @@ dictionary PaymentMethodChangeEventInit : PaymentRequestUpdateEventInit {
 [SecureContext, Exposed=Window]
 interface PaymentRequestUpdateEvent : Event {
   constructor(DOMString type, optional PaymentRequestUpdateEventInit eventInitDict = {});
-  void updateWith(Promise<PaymentDetailsUpdate> detailsPromise);
+  undefined updateWith(Promise<PaymentDetailsUpdate> detailsPromise);
 };
 
 dictionary PaymentRequestUpdateEventInit : EventInit {};
diff --git a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl b/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
index 36107ddeea2..34f62a37823 100644
--- a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
+++ b/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Performance Timeline Level 2 (https://w3c.github.io/performance-timeline/)
 
 partial interface Performance {
@@ -19,14 +19,14 @@ interface PerformanceEntry {
   [Default] object toJSON();
 };
 
-callback PerformanceObserverCallback = void (PerformanceObserverEntryList entries,
+callback PerformanceObserverCallback = undefined (PerformanceObserverEntryList entries,
                                              PerformanceObserver observer,
                                              optional boolean hasDroppedEntry = false);
 [Exposed=(Window,Worker)]
 interface PerformanceObserver {
   constructor(PerformanceObserverCallback callback);
-  void observe (optional PerformanceObserverInit options = {});
-  void disconnect ();
+  undefined observe (optional PerformanceObserverInit options = {});
+  undefined disconnect ();
   PerformanceEntryList takeRecords();
   [SameObject] static readonly attribute FrozenArray<DOMString> supportedEntryTypes;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/periodic-background-sync.idl b/tests/wpt/web-platform-tests/interfaces/periodic-background-sync.idl
index 14ee8bbc30d..37a58ba1495 100644
--- a/tests/wpt/web-platform-tests/interfaces/periodic-background-sync.idl
+++ b/tests/wpt/web-platform-tests/interfaces/periodic-background-sync.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Periodic Background Synchronization (https://wicg.github.io/periodic-background-sync/)
 
 partial interface ServiceWorkerGlobalScope {
diff --git a/tests/wpt/web-platform-tests/interfaces/permissions-request.idl b/tests/wpt/web-platform-tests/interfaces/permissions-request.idl
index 08431fbab85..e189194dd0b 100644
--- a/tests/wpt/web-platform-tests/interfaces/permissions-request.idl
+++ b/tests/wpt/web-platform-tests/interfaces/permissions-request.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Requesting Permissions (https://wicg.github.io/permissions-request/)
 
 partial interface Permissions {
diff --git a/tests/wpt/web-platform-tests/interfaces/permissions-revoke.idl b/tests/wpt/web-platform-tests/interfaces/permissions-revoke.idl
index 4c2bcf7b99f..5e8f386cfbc 100644
--- a/tests/wpt/web-platform-tests/interfaces/permissions-revoke.idl
+++ b/tests/wpt/web-platform-tests/interfaces/permissions-revoke.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Relinquishing Permissions (https://wicg.github.io/permissions-revoke/)
 
 partial interface Permissions {
diff --git a/tests/wpt/web-platform-tests/interfaces/permissions.idl b/tests/wpt/web-platform-tests/interfaces/permissions.idl
index d45c7f93cac..dfc934f9ce3 100644
--- a/tests/wpt/web-platform-tests/interfaces/permissions.idl
+++ b/tests/wpt/web-platform-tests/interfaces/permissions.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Permissions (https://w3c.github.io/permissions/)
 
 dictionary PermissionDescriptor {
diff --git a/tests/wpt/web-platform-tests/interfaces/picture-in-picture.idl b/tests/wpt/web-platform-tests/interfaces/picture-in-picture.idl
index 19597733560..19a3608b4b3 100644
--- a/tests/wpt/web-platform-tests/interfaces/picture-in-picture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/picture-in-picture.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Picture-in-Picture (https://w3c.github.io/picture-in-picture/)
 
 partial interface HTMLVideoElement {
@@ -16,7 +16,7 @@ partial interface HTMLVideoElement {
 partial interface Document {
   readonly attribute boolean pictureInPictureEnabled;
 
-  [NewObject] Promise<void> exitPictureInPicture();
+  [NewObject] Promise<undefined> exitPictureInPicture();
 };
 
 partial interface mixin DocumentOrShadowRoot {
diff --git a/tests/wpt/web-platform-tests/interfaces/pointerevents.idl b/tests/wpt/web-platform-tests/interfaces/pointerevents.idl
index e977ce73420..6647589dfdd 100644
--- a/tests/wpt/web-platform-tests/interfaces/pointerevents.idl
+++ b/tests/wpt/web-platform-tests/interfaces/pointerevents.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Pointer Events (https://w3c.github.io/pointerevents/)
 
 dictionary PointerEventInit : MouseEventInit {
@@ -40,8 +40,8 @@ interface PointerEvent : MouseEvent {
 };
 
 partial interface Element {
-  void setPointerCapture (long pointerId);
-  void releasePointerCapture (long pointerId);
+  undefined setPointerCapture (long pointerId);
+  undefined releasePointerCapture (long pointerId);
   boolean hasPointerCapture (long pointerId);
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/pointerlock.idl b/tests/wpt/web-platform-tests/interfaces/pointerlock.idl
index 12e984b33c6..7670ec76cbd 100644
--- a/tests/wpt/web-platform-tests/interfaces/pointerlock.idl
+++ b/tests/wpt/web-platform-tests/interfaces/pointerlock.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Pointer Lock 2.0 (https://w3c.github.io/pointerlock/)
 
 partial interface Element {
diff --git a/tests/wpt/web-platform-tests/interfaces/presentation-api.idl b/tests/wpt/web-platform-tests/interfaces/presentation-api.idl
index dfaa022b952..0757e9b8bf2 100644
--- a/tests/wpt/web-platform-tests/interfaces/presentation-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/presentation-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Presentation API (https://w3c.github.io/presentation-api/)
 
 partial interface Navigator {
diff --git a/tests/wpt/web-platform-tests/interfaces/proximity.idl b/tests/wpt/web-platform-tests/interfaces/proximity.idl
index d4c8fae3a54..9ca71e01081 100644
--- a/tests/wpt/web-platform-tests/interfaces/proximity.idl
+++ b/tests/wpt/web-platform-tests/interfaces/proximity.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Proximity Sensor (https://w3c.github.io/proximity/)
 
 [Constructor(optional SensorOptions sensorOptions = {}), SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/push-api.idl b/tests/wpt/web-platform-tests/interfaces/push-api.idl
index 419fe25e08b..07868235be0 100644
--- a/tests/wpt/web-platform-tests/interfaces/push-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/push-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Push API (https://w3c.github.io/push-api/)
 
 [SecureContext]
diff --git a/tests/wpt/web-platform-tests/interfaces/referrer-policy.idl b/tests/wpt/web-platform-tests/interfaces/referrer-policy.idl
index 962f7143a9e..0ef9a1fdecc 100644
--- a/tests/wpt/web-platform-tests/interfaces/referrer-policy.idl
+++ b/tests/wpt/web-platform-tests/interfaces/referrer-policy.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Referrer Policy (https://w3c.github.io/webappsec-referrer-policy/)
 
 enum ReferrerPolicy {
diff --git a/tests/wpt/web-platform-tests/interfaces/remote-playback.idl b/tests/wpt/web-platform-tests/interfaces/remote-playback.idl
index 2b0d85316c2..724f3dfa8d2 100644
--- a/tests/wpt/web-platform-tests/interfaces/remote-playback.idl
+++ b/tests/wpt/web-platform-tests/interfaces/remote-playback.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Remote Playback API (https://w3c.github.io/remote-playback/)
 
 [Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/reporting.idl b/tests/wpt/web-platform-tests/interfaces/reporting.idl
index d42f0bac59c..150f30d03bf 100644
--- a/tests/wpt/web-platform-tests/interfaces/reporting.idl
+++ b/tests/wpt/web-platform-tests/interfaces/reporting.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Reporting API 1 (https://w3c.github.io/reporting/)
 
 [Exposed=(Window,Worker)]
@@ -19,12 +19,12 @@ interface Report {
 [Exposed=(Window,Worker)]
 interface ReportingObserver {
   constructor(ReportingObserverCallback callback, optional ReportingObserverOptions options = {});
-  void observe();
-  void disconnect();
+  undefined observe();
+  undefined disconnect();
   ReportList takeRecords();
 };
 
-callback ReportingObserverCallback = void (sequence<Report> reports, ReportingObserver observer);
+callback ReportingObserverCallback = undefined (sequence<Report> reports, ReportingObserver observer);
 
 dictionary ReportingObserverOptions {
   sequence<DOMString> types;
diff --git a/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl b/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl
index c763b50bde7..fc21145eabc 100644
--- a/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl
+++ b/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl
@@ -1,11 +1,11 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Cooperative Scheduling of Background Tasks (https://w3c.github.io/requestidlecallback/)
 
 partial interface Window {
   unsigned long requestIdleCallback(IdleRequestCallback callback, optional IdleRequestOptions options = {});
-  void cancelIdleCallback(unsigned long handle);
+  undefined cancelIdleCallback(unsigned long handle);
 };
 
 dictionary IdleRequestOptions {
@@ -17,4 +17,4 @@ dictionary IdleRequestOptions {
   readonly attribute boolean didTimeout;
 };
 
-callback IdleRequestCallback = void (IdleDeadline deadline);
+callback IdleRequestCallback = undefined (IdleDeadline deadline);
diff --git a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl b/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
index f20b719d11e..0d2aa2863a7 100644
--- a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Resize Observer (https://drafts.csswg.org/resize-observer/)
 
 enum ResizeObserverBoxOptions {
@@ -14,12 +14,12 @@ dictionary ResizeObserverOptions {
 [Exposed=(Window)]
 interface ResizeObserver {
     constructor(ResizeObserverCallback callback);
-    void observe(Element target, optional ResizeObserverOptions options);
-    void unobserve(Element target);
-    void disconnect();
+    undefined observe(Element target, optional ResizeObserverOptions options = {});
+    undefined unobserve(Element target);
+    undefined disconnect();
 };
 
-callback ResizeObserverCallback = void (sequence<ResizeObserverEntry> entries, ResizeObserver observer);
+callback ResizeObserverCallback = undefined (sequence<ResizeObserverEntry> entries, ResizeObserver observer);
 
 [Exposed=Window]
 interface ResizeObserverEntry {
@@ -30,6 +30,7 @@ interface ResizeObserverEntry {
     readonly attribute FrozenArray<ResizeObserverSize> devicePixelContentBoxSize;
 };
 
+[Exposed=Window]
 interface ResizeObserverSize {
     readonly attribute unrestricted double inlineSize;
     readonly attribute unrestricted double blockSize;
diff --git a/tests/wpt/web-platform-tests/interfaces/resource-timing.idl b/tests/wpt/web-platform-tests/interfaces/resource-timing.idl
index cbc17683b26..112266865bb 100644
--- a/tests/wpt/web-platform-tests/interfaces/resource-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/resource-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Resource Timing Level 2 (https://w3c.github.io/resource-timing/)
 
 [Exposed=(Window,Worker)]
@@ -26,7 +26,7 @@ interface PerformanceResourceTiming : PerformanceEntry {
 };
 
 partial interface Performance {
-  void clearResourceTimings ();
-  void setResourceTimingBufferSize (unsigned long maxSize);
+  undefined clearResourceTimings ();
+  undefined setResourceTimingBufferSize (unsigned long maxSize);
               attribute EventHandler onresourcetimingbufferfull;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl b/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
new file mode 100644
index 00000000000..25cba22ecfc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/sanitizer-api.tentative.idl
@@ -0,0 +1,11 @@
+// https://wicg.github.io/sanitizer-api/
+
+[
+  Exposed=Window
+] interface Sanitizer {
+  [RaisesException] constructor(optional SanitizerConfig sanitizerConfig = {});
+  [CallWith=ScriptState, RaisesException] DocumentFragment sanitize(DOMString input);
+  [CallWith=ScriptState, RaisesException] DOMString sanitizeToString(DOMString input);
+};
+
+dictionary SanitizerConfig {};
diff --git a/tests/wpt/web-platform-tests/interfaces/savedata.idl b/tests/wpt/web-platform-tests/interfaces/savedata.idl
index 4d9e3b98d3c..f1274b8ef74 100644
--- a/tests/wpt/web-platform-tests/interfaces/savedata.idl
+++ b/tests/wpt/web-platform-tests/interfaces/savedata.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Save Data API (https://wicg.github.io/savedata/)
 
 interface mixin NetworkInformationSaveData {
diff --git a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl b/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
index 4936ee9a519..7786b7fb4d7 100644
--- a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Screen Capture (https://w3c.github.io/mediacapture-screen-share/)
 
 partial interface MediaDevices {
diff --git a/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl b/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl
index b5481216729..9e9dbc67ba7 100644
--- a/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl
+++ b/tests/wpt/web-platform-tests/interfaces/screen-orientation.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: The Screen Orientation API (https://w3c.github.io/screen-orientation/)
 
 partial interface Screen {
diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
index 782d08f4c40..df35313b48a 100644
--- a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
+++ b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Scroll-linked Animations (https://drafts.csswg.org/scroll-animations-1/)
 
 enum ScrollDirection {
diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-to-text-fragment.idl b/tests/wpt/web-platform-tests/interfaces/scroll-to-text-fragment.idl
new file mode 100644
index 00000000000..ce571ddd694
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/scroll-to-text-fragment.idl
@@ -0,0 +1,12 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Text Fragments (https://wicg.github.io/scroll-to-text-fragment/)
+
+[Exposed=Window]
+interface FragmentDirective {
+};
+
+partial interface Document {
+    [SameObject] readonly attribute FragmentDirective fragmentDirective;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/secure-contexts.idl b/tests/wpt/web-platform-tests/interfaces/secure-contexts.idl
deleted file mode 100644
index c177b27a012..00000000000
--- a/tests/wpt/web-platform-tests/interfaces/secure-contexts.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
-// Source: Secure Contexts (https://w3c.github.io/webappsec-secure-contexts/)
-
-partial interface mixin WindowOrWorkerGlobalScope {
-  readonly attribute boolean isSecureContext;
-};
diff --git a/tests/wpt/web-platform-tests/interfaces/selection-api.idl b/tests/wpt/web-platform-tests/interfaces/selection-api.idl
index 63c96169b08..b6626292183 100644
--- a/tests/wpt/web-platform-tests/interfaces/selection-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/selection-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Selection API (https://w3c.github.io/selection-api/)
 
 [Exposed=Window]
@@ -13,19 +13,19 @@ interface Selection {
   readonly attribute unsigned long rangeCount;
   readonly attribute DOMString type;
   Range getRangeAt(unsigned long index);
-  void addRange(Range range);
-  void removeRange(Range range);
-  void removeAllRanges();
-  void empty();
-  void collapse(Node? node, optional unsigned long offset = 0);
-  void setPosition(Node? node, optional unsigned long offset = 0);
-  void collapseToStart();
-  void collapseToEnd();
-  void extend(Node node, optional unsigned long offset = 0);
-  void setBaseAndExtent(Node anchorNode, unsigned long anchorOffset, Node focusNode, unsigned long focusOffset);
-  void selectAllChildren(Node node);
+  undefined addRange(Range range);
+  undefined removeRange(Range range);
+  undefined removeAllRanges();
+  undefined empty();
+  undefined collapse(Node? node, optional unsigned long offset = 0);
+  undefined setPosition(Node? node, optional unsigned long offset = 0);
+  undefined collapseToStart();
+  undefined collapseToEnd();
+  undefined extend(Node node, optional unsigned long offset = 0);
+  undefined setBaseAndExtent(Node anchorNode, unsigned long anchorOffset, Node focusNode, unsigned long focusOffset);
+  undefined selectAllChildren(Node node);
   [CEReactions]
-  void deleteFromDocument();
+  undefined deleteFromDocument();
   boolean containsNode(Node node, optional boolean allowPartialContainment = false);
   stringifier DOMString ();
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/server-timing.idl b/tests/wpt/web-platform-tests/interfaces/server-timing.idl
index bf7488d2cee..ef2a761dfca 100644
--- a/tests/wpt/web-platform-tests/interfaces/server-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/server-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Server Timing (https://w3c.github.io/server-timing/)
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/service-workers.idl b/tests/wpt/web-platform-tests/interfaces/service-workers.idl
index 3d5e63a8120..aac74741a01 100644
--- a/tests/wpt/web-platform-tests/interfaces/service-workers.idl
+++ b/tests/wpt/web-platform-tests/interfaces/service-workers.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Service Workers Nightly (https://w3c.github.io/ServiceWorker/)
 
 [SecureContext, Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/shape-detection-api.idl b/tests/wpt/web-platform-tests/interfaces/shape-detection-api.idl
index 5b1c45a7739..4fc1f085ea2 100644
--- a/tests/wpt/web-platform-tests/interfaces/shape-detection-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/shape-detection-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Accelerated Shape Detection in Images (https://wicg.github.io/shape-detection-api/)
 
 [Exposed=(Window,Worker),
diff --git a/tests/wpt/web-platform-tests/interfaces/speech-api.idl b/tests/wpt/web-platform-tests/interfaces/speech-api.idl
index 0aad231d344..74085481525 100644
--- a/tests/wpt/web-platform-tests/interfaces/speech-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/speech-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Speech API (https://wicg.github.io/speech-api/)
 
 [Exposed=Window]
@@ -15,9 +15,9 @@ interface SpeechRecognition : EventTarget {
     attribute unsigned long maxAlternatives;
 
     // methods to drive the speech interaction
-    void start();
-    void stop();
-    void abort();
+    undefined start();
+    undefined stop();
+    undefined abort();
 
     // event methods
     attribute EventHandler onaudiostart;
@@ -104,9 +104,9 @@ interface SpeechGrammarList {
     constructor();
     readonly attribute unsigned long length;
     getter SpeechGrammar item(unsigned long index);
-    void addFromURI(DOMString src,
+    undefined addFromURI(DOMString src,
                     optional float weight = 1.0);
-    void addFromString(DOMString string,
+    undefined addFromString(DOMString string,
                     optional float weight = 1.0);
 };
 
@@ -118,10 +118,10 @@ interface SpeechSynthesis : EventTarget {
 
     attribute EventHandler onvoiceschanged;
 
-    void speak(SpeechSynthesisUtterance utterance);
-    void cancel();
-    void pause();
-    void resume();
+    undefined speak(SpeechSynthesisUtterance utterance);
+    undefined cancel();
+    undefined pause();
+    undefined resume();
     sequence<SpeechSynthesisVoice> getVoices();
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/storage-access.idl b/tests/wpt/web-platform-tests/interfaces/storage-access.idl
index 18dd08f7c29..fff583e0982 100644
--- a/tests/wpt/web-platform-tests/interfaces/storage-access.idl
+++ b/tests/wpt/web-platform-tests/interfaces/storage-access.idl
@@ -1,9 +1,9 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: The Storage Access API (https://privacycg.github.io/storage-access/)
 
 partial interface Document {
   Promise<boolean> hasStorageAccess();
-  Promise<void> requestStorageAccess();
+  Promise<undefined> requestStorageAccess();
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/storage.idl b/tests/wpt/web-platform-tests/interfaces/storage.idl
index 437bc6dd43c..d47e37c40e8 100644
--- a/tests/wpt/web-platform-tests/interfaces/storage.idl
+++ b/tests/wpt/web-platform-tests/interfaces/storage.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Storage Standard (https://storage.spec.whatwg.org/)
 
 [SecureContext]
diff --git a/tests/wpt/web-platform-tests/interfaces/streams.idl b/tests/wpt/web-platform-tests/interfaces/streams.idl
index f96c196385c..1df6827189d 100644
--- a/tests/wpt/web-platform-tests/interfaces/streams.idl
+++ b/tests/wpt/web-platform-tests/interfaces/streams.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Streams Standard (https://streams.spec.whatwg.org/)
 
 [Exposed=(Window,Worker,Worklet), Transferable]
@@ -9,10 +9,10 @@ interface ReadableStream {
 
   readonly attribute boolean locked;
 
-  Promise<void> cancel(optional any reason);
+  Promise<undefined> cancel(optional any reason);
   ReadableStreamReader getReader(optional ReadableStreamGetReaderOptions options = {});
   ReadableStream pipeThrough(ReadableWritablePair transform, optional StreamPipeOptions options = {});
-  Promise<void> pipeTo(WritableStream destination, optional StreamPipeOptions options = {});
+  Promise<undefined> pipeTo(WritableStream destination, optional StreamPipeOptions options = {});
   sequence<ReadableStream> tee();
 
   async iterable<any>(optional ReadableStreamIteratorOptions options = {});
@@ -53,15 +53,15 @@ dictionary UnderlyingSource {
 typedef (ReadableStreamDefaultController or ReadableByteStreamController) ReadableStreamController;
 
 callback UnderlyingSourceStartCallback = any (ReadableStreamController controller);
-callback UnderlyingSourcePullCallback = Promise<void> (ReadableStreamController controller);
-callback UnderlyingSourceCancelCallback = Promise<void> (optional any reason);
+callback UnderlyingSourcePullCallback = Promise<undefined> (ReadableStreamController controller);
+callback UnderlyingSourceCancelCallback = Promise<undefined> (optional any reason);
 
 enum ReadableStreamType { "bytes" };
 
 interface mixin ReadableStreamGenericReader {
-  readonly attribute Promise<void> closed;
+  readonly attribute Promise<undefined> closed;
 
-  Promise<void> cancel(optional any reason);
+  Promise<undefined> cancel(optional any reason);
 };
 
 [Exposed=(Window,Worker,Worklet)]
@@ -69,7 +69,7 @@ interface ReadableStreamDefaultReader {
   constructor(ReadableStream stream);
 
   Promise<ReadableStreamDefaultReadResult> read();
-  void releaseLock();
+  undefined releaseLock();
 };
 ReadableStreamDefaultReader includes ReadableStreamGenericReader;
 
@@ -83,7 +83,7 @@ interface ReadableStreamBYOBReader {
   constructor(ReadableStream stream);
 
   Promise<ReadableStreamBYOBReadResult> read(ArrayBufferView view);
-  void releaseLock();
+  undefined releaseLock();
 };
 ReadableStreamBYOBReader includes ReadableStreamGenericReader;
 
@@ -96,9 +96,9 @@ dictionary ReadableStreamBYOBReadResult {
 interface ReadableStreamDefaultController {
   readonly attribute unrestricted double? desiredSize;
 
-  void close();
-  void enqueue(optional any chunk);
-  void error(optional any e);
+  undefined close();
+  undefined enqueue(optional any chunk);
+  undefined error(optional any e);
 };
 
 [Exposed=(Window,Worker,Worklet)]
@@ -106,17 +106,17 @@ interface ReadableByteStreamController {
   readonly attribute ReadableStreamBYOBRequest? byobRequest;
   readonly attribute unrestricted double? desiredSize;
 
-  void close();
-  void enqueue(ArrayBufferView chunk);
-  void error(optional any e);
+  undefined close();
+  undefined enqueue(ArrayBufferView chunk);
+  undefined error(optional any e);
 };
 
 [Exposed=(Window,Worker,Worklet)]
 interface ReadableStreamBYOBRequest {
   readonly attribute ArrayBufferView? view;
 
-  void respond([EnforceRange] unsigned long long bytesWritten);
-  void respondWithNewView(ArrayBufferView view);
+  undefined respond([EnforceRange] unsigned long long bytesWritten);
+  undefined respondWithNewView(ArrayBufferView view);
 };
 
 [Exposed=(Window,Worker,Worklet), Transferable]
@@ -125,8 +125,8 @@ interface WritableStream {
 
   readonly attribute boolean locked;
 
-  Promise<void> abort(optional any reason);
-  Promise<void> close();
+  Promise<undefined> abort(optional any reason);
+  Promise<undefined> close();
   WritableStreamDefaultWriter getWriter();
 };
 
@@ -139,27 +139,27 @@ dictionary UnderlyingSink {
 };
 
 callback UnderlyingSinkStartCallback = any (WritableStreamDefaultController controller);
-callback UnderlyingSinkWriteCallback = Promise<void> (any chunk, WritableStreamDefaultController controller);
-callback UnderlyingSinkCloseCallback = Promise<void> ();
-callback UnderlyingSinkAbortCallback = Promise<void> (optional any reason);
+callback UnderlyingSinkWriteCallback = Promise<undefined> (any chunk, WritableStreamDefaultController controller);
+callback UnderlyingSinkCloseCallback = Promise<undefined> ();
+callback UnderlyingSinkAbortCallback = Promise<undefined> (optional any reason);
 
 [Exposed=(Window,Worker,Worklet)]
 interface WritableStreamDefaultWriter {
   constructor(WritableStream stream);
 
-  readonly attribute Promise<void> closed;
+  readonly attribute Promise<undefined> closed;
   readonly attribute unrestricted double? desiredSize;
-  readonly attribute Promise<void> ready;
+  readonly attribute Promise<undefined> ready;
 
-  Promise<void> abort(optional any reason);
-  Promise<void> close();
-  void releaseLock();
-  Promise<void> write(optional any chunk);
+  Promise<undefined> abort(optional any reason);
+  Promise<undefined> close();
+  undefined releaseLock();
+  Promise<undefined> write(optional any chunk);
 };
 
 [Exposed=(Window,Worker,Worklet)]
 interface WritableStreamDefaultController {
-  void error(optional any e);
+  undefined error(optional any e);
 };
 
 [Exposed=(Window,Worker,Worklet), Transferable]
@@ -181,16 +181,16 @@ dictionary Transformer {
 };
 
 callback TransformerStartCallback = any (TransformStreamDefaultController controller);
-callback TransformerFlushCallback = Promise<void> (TransformStreamDefaultController controller);
-callback TransformerTransformCallback = Promise<void> (any chunk, TransformStreamDefaultController controller);
+callback TransformerFlushCallback = Promise<undefined> (TransformStreamDefaultController controller);
+callback TransformerTransformCallback = Promise<undefined> (any chunk, TransformStreamDefaultController controller);
 
 [Exposed=(Window,Worker,Worklet)]
 interface TransformStreamDefaultController {
   readonly attribute unrestricted double? desiredSize;
 
-  void enqueue(optional any chunk);
-  void error(optional any reason);
-  void terminate();
+  undefined enqueue(optional any chunk);
+  undefined error(optional any reason);
+  undefined terminate();
 };
 
 dictionary QueuingStrategy {
diff --git a/tests/wpt/web-platform-tests/interfaces/touch-events.idl b/tests/wpt/web-platform-tests/interfaces/touch-events.idl
index 84c48284a1b..653414fcaaa 100644
--- a/tests/wpt/web-platform-tests/interfaces/touch-events.idl
+++ b/tests/wpt/web-platform-tests/interfaces/touch-events.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Touch Events - Level 2 (https://w3c.github.io/touch-events/)
 
 enum TouchType {
diff --git a/tests/wpt/web-platform-tests/interfaces/ua-client-hints.idl b/tests/wpt/web-platform-tests/interfaces/ua-client-hints.idl
index 14e941bd407..6e59d8e1fef 100644
--- a/tests/wpt/web-platform-tests/interfaces/ua-client-hints.idl
+++ b/tests/wpt/web-platform-tests/interfaces/ua-client-hints.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: User-Agent Client Hints (https://wicg.github.io/ua-client-hints/)
 
 dictionary NavigatorUABrandVersion {
diff --git a/tests/wpt/web-platform-tests/interfaces/uievents.idl b/tests/wpt/web-platform-tests/interfaces/uievents.idl
index 67405ebf118..d5506ef7781 100644
--- a/tests/wpt/web-platform-tests/interfaces/uievents.idl
+++ b/tests/wpt/web-platform-tests/interfaces/uievents.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: UI Events (https://w3c.github.io/uievents/)
 
 [Exposed=Window]
@@ -162,3 +162,9 @@ partial interface KeyboardEvent {
   readonly attribute unsigned long charCode;
   readonly attribute unsigned long keyCode;
 };
+
+partial dictionary KeyboardEventInit {
+  // The following support legacy user agents
+  unsigned long charCode = 0;
+  unsigned long keyCode = 0;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/url.idl b/tests/wpt/web-platform-tests/interfaces/url.idl
index b0b237e8524..b00ab4b83bc 100644
--- a/tests/wpt/web-platform-tests/interfaces/url.idl
+++ b/tests/wpt/web-platform-tests/interfaces/url.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: URL Standard (https://url.spec.whatwg.org/)
 
 [Exposed=(Window,Worker),
@@ -28,14 +28,14 @@ interface URL {
 interface URLSearchParams {
   constructor(optional (sequence<sequence<USVString>> or record<USVString, USVString> or USVString) init = "");
 
-  void append(USVString name, USVString value);
-  void delete(USVString name);
+  undefined append(USVString name, USVString value);
+  undefined delete(USVString name);
   USVString? get(USVString name);
   sequence<USVString> getAll(USVString name);
   boolean has(USVString name);
-  void set(USVString name, USVString value);
+  undefined set(USVString name, USVString value);
 
-  void sort();
+  undefined sort();
 
   iterable<USVString, USVString>;
   stringifier;
diff --git a/tests/wpt/web-platform-tests/interfaces/user-timing.idl b/tests/wpt/web-platform-tests/interfaces/user-timing.idl
index 8af17fdc03f..28ee8aac2b1 100644
--- a/tests/wpt/web-platform-tests/interfaces/user-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/user-timing.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: User Timing Level 3 (https://w3c.github.io/user-timing/)
 
 dictionary PerformanceMarkOptions {
@@ -17,9 +17,9 @@ dictionary PerformanceMeasureOptions {
 
 partial interface Performance {
     PerformanceMark mark(DOMString markName, optional PerformanceMarkOptions markOptions = {});
-    void clearMarks(optional DOMString markName);
+    undefined clearMarks(optional DOMString markName);
     PerformanceMeasure measure(DOMString measureName, optional (DOMString or PerformanceMeasureOptions) startOrMeasureOptions = {}, optional DOMString endMark);
-    void clearMeasures(optional DOMString measureName);
+    undefined clearMeasures(optional DOMString measureName);
 };
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/vibration.idl b/tests/wpt/web-platform-tests/interfaces/vibration.idl
index cc5cd194b55..22ab1c47df0 100644
--- a/tests/wpt/web-platform-tests/interfaces/vibration.idl
+++ b/tests/wpt/web-platform-tests/interfaces/vibration.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Vibration API (Second Edition) (https://w3c.github.io/vibration/)
 
 typedef (unsigned long or sequence<unsigned long>) VibratePattern;
diff --git a/tests/wpt/web-platform-tests/interfaces/video-rvfc.idl b/tests/wpt/web-platform-tests/interfaces/video-rvfc.idl
index a86e2b364df..4c76b8e7d4f 100644
--- a/tests/wpt/web-platform-tests/interfaces/video-rvfc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/video-rvfc.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: HTMLVideoElement.requestVideoFrameCallback() (https://wicg.github.io/video-rvfc/)
 
 dictionary VideoFrameMetadata {
@@ -19,9 +19,9 @@ dictionary VideoFrameMetadata {
   unsigned long rtpTimestamp;
 };
 
-callback VideoFrameRequestCallback = void(DOMHighResTimeStamp now, VideoFrameMetadata metadata);
+callback VideoFrameRequestCallback = undefined(DOMHighResTimeStamp now, VideoFrameMetadata metadata);
 
 partial interface HTMLVideoElement {
     unsigned long requestVideoFrameCallback(VideoFrameRequestCallback callback);
-    void cancelVideoFrameCallback(unsigned long handle);
+    undefined cancelVideoFrameCallback(unsigned long handle);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl b/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl
index 5e4b5413694..c66e85bdcc1 100644
--- a/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl
+++ b/tests/wpt/web-platform-tests/interfaces/visual-viewport.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Visual Viewport API (https://wicg.github.io/visual-viewport/)
 
 partial interface Window {
diff --git a/tests/wpt/web-platform-tests/interfaces/wai-aria.idl b/tests/wpt/web-platform-tests/interfaces/wai-aria.idl
index 5b1bacc932f..557d8a98957 100644
--- a/tests/wpt/web-platform-tests/interfaces/wai-aria.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wai-aria.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Accessible Rich Internet Applications (WAI-ARIA) 1.2 (https://w3c.github.io/aria/)
 
 interface mixin AccessibilityRole {
diff --git a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
index 1eb30a06024..56bc8f43e4d 100644
--- a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Screen Wake Lock API (https://w3c.github.io/screen-wake-lock/)
 
 [SecureContext]
@@ -15,8 +15,9 @@ interface WakeLock {
 
 [SecureContext, Exposed=(Window)]
 interface WakeLockSentinel : EventTarget {
+  readonly attribute boolean released;
   readonly attribute WakeLockType type;
-  Promise<void> release();
+  Promise<undefined> release();
   attribute EventHandler onrelease;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl b/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl
index cc943610145..71d7207a712 100644
--- a/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebAssembly JavaScript Interface (https://webassembly.github.io/spec/js-api/)
 
 dictionary WebAssemblyInstantiatedSource {
@@ -82,7 +82,7 @@ interface Table {
   constructor(TableDescriptor descriptor);
   unsigned long grow([EnforceRange] unsigned long delta);
   Function? get([EnforceRange] unsigned long index);
-  void set([EnforceRange] unsigned long index, Function? value);
+  undefined set([EnforceRange] unsigned long index, Function? value);
   readonly attribute unsigned long length;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/wasm-web-api.idl b/tests/wpt/web-platform-tests/interfaces/wasm-web-api.idl
index 23856007a6d..088c8ee3a39 100644
--- a/tests/wpt/web-platform-tests/interfaces/wasm-web-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wasm-web-api.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebAssembly Web API (https://webassembly.github.io/spec/web-api/)
 
 [Exposed=(Window,Worker)]
diff --git a/tests/wpt/web-platform-tests/interfaces/web-animations.idl b/tests/wpt/web-platform-tests/interfaces/web-animations.idl
index 2f2b086e65c..6e973d195e3 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-animations.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-animations.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Animations (https://drafts.csswg.org/web-animations-1/)
 
 [Exposed=Window]
@@ -36,14 +36,14 @@ interface Animation : EventTarget {
              attribute EventHandler             onfinish;
              attribute EventHandler             oncancel;
              attribute EventHandler             onremove;
-    void cancel();
-    void finish();
-    void play();
-    void pause();
-    void updatePlaybackRate(double playbackRate);
-    void reverse();
-    void persist();
-    void commitStyles();
+    undefined cancel();
+    undefined finish();
+    undefined play();
+    undefined pause();
+    undefined updatePlaybackRate(double playbackRate);
+    undefined reverse();
+    undefined persist();
+    undefined commitStyles();
 };
 
 enum AnimationPlayState { "idle", "running", "paused", "finished" };
@@ -56,7 +56,7 @@ enum TimelinePhase { "inactive", "before", "active", "after" };
 interface AnimationEffect {
     EffectTiming         getTiming();
     ComputedEffectTiming getComputedTiming();
-    void                 updateTiming(optional OptionalEffectTiming timing = {});
+    undefined            updateTiming(optional OptionalEffectTiming timing = {});
 };
 
 dictionary EffectTiming {
@@ -103,7 +103,7 @@ interface KeyframeEffect : AnimationEffect {
     attribute CSSOMString?       pseudoElement;
     attribute CompositeOperation composite;
     sequence<object> getKeyframes();
-    void             setKeyframes(object? keyframes);
+    undefined        setKeyframes(object? keyframes);
 };
 
 dictionary BaseComputedKeyframe {
diff --git a/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl b/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl
index 73371e26996..83071f368f0 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-bluetooth.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Bluetooth (https://webbluetoothcg.github.io/web-bluetooth/)
 
 dictionary BluetoothDataFilterInit {
diff --git a/tests/wpt/web-platform-tests/interfaces/web-locks.idl b/tests/wpt/web-platform-tests/interfaces/web-locks.idl
index 83905d64fec..a0319a00fd2 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-locks.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-locks.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Locks API (https://wicg.github.io/web-locks/)
 
 [SecureContext]
diff --git a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
index f2e31b73528..5a56612db03 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web NFC (https://w3c.github.io/web-nfc/)
 
 [SecureContext, Exposed=Window]
@@ -47,7 +47,7 @@ typedef (DOMString or BufferSource or NDEFMessageInit) NDEFMessageSource;
 interface NDEFWriter {
   constructor();
 
-  Promise<void> write(NDEFMessageSource message, optional NDEFWriteOptions options={});
+  Promise<undefined> write(NDEFMessageSource message, optional NDEFWriteOptions options={});
 };
 
 [SecureContext, Exposed=Window]
@@ -57,7 +57,7 @@ interface NDEFReader : EventTarget {
   attribute EventHandler onerror;
   attribute EventHandler onreading;
 
-  Promise<void> scan(optional NDEFScanOptions options={});
+  Promise<undefined> scan(optional NDEFScanOptions options={});
 };
 
 [SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/web-otp.idl b/tests/wpt/web-platform-tests/interfaces/web-otp.idl
index 023de325931..77627dad138 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-otp.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-otp.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web OTP API (https://wicg.github.io/web-otp/)
 
 [Exposed=Window, SecureContext]
diff --git a/tests/wpt/web-platform-tests/interfaces/web-share.idl b/tests/wpt/web-platform-tests/interfaces/web-share.idl
index b66bcd81fe9..4d17f5bfe54 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-share.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-share.idl
@@ -1,10 +1,10 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Share API (https://w3c.github.io/web-share/)
 
 partial interface Navigator {
-  [SecureContext] Promise<void> share(optional ShareData data = {});
+  [SecureContext] Promise<undefined> share(optional ShareData data = {});
 };
 
 dictionary ShareData {
diff --git a/tests/wpt/web-platform-tests/interfaces/webaudio.idl b/tests/wpt/web-platform-tests/interfaces/webaudio.idl
index f0a5c7a9020..d869a978e34 100644
--- a/tests/wpt/web-platform-tests/interfaces/webaudio.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webaudio.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Audio API (https://webaudio.github.io/web-audio-api/)
 
 enum AudioContextState {
@@ -9,9 +9,9 @@ enum AudioContextState {
   "closed"
 };
 
-callback DecodeErrorCallback = void (DOMException error);
+callback DecodeErrorCallback = undefined (DOMException error);
 
-callback DecodeSuccessCallback = void (AudioBuffer decodedData);
+callback DecodeSuccessCallback = undefined (AudioBuffer decodedData);
 
 [Exposed=Window]
 interface BaseAudioContext : EventTarget {
@@ -70,9 +70,9 @@ interface AudioContext : BaseAudioContext {
   readonly attribute double baseLatency;
   readonly attribute double outputLatency;
   AudioTimestamp getOutputTimestamp ();
-  Promise<void> resume ();
-  Promise<void> suspend ();
-  Promise<void> close ();
+  Promise<undefined> resume ();
+  Promise<undefined> suspend ();
+  Promise<undefined> close ();
   MediaElementAudioSourceNode createMediaElementSource (HTMLMediaElement mediaElement);
   MediaStreamAudioSourceNode createMediaStreamSource (MediaStream mediaStream);
   MediaStreamTrackAudioSourceNode createMediaStreamTrackSource (
@@ -95,8 +95,8 @@ interface OfflineAudioContext : BaseAudioContext {
   constructor(OfflineAudioContextOptions contextOptions);
   constructor(unsigned long numberOfChannels, unsigned long length, float sampleRate);
   Promise<AudioBuffer> startRendering();
-  Promise<void> resume();
-  Promise<void> suspend(double suspendTime);
+  Promise<undefined> resume();
+  Promise<undefined> suspend(double suspendTime);
   readonly attribute unsigned long length;
   attribute EventHandler oncomplete;
 };
@@ -125,12 +125,12 @@ interface AudioBuffer {
   readonly attribute double duration;
   readonly attribute unsigned long numberOfChannels;
   Float32Array getChannelData (unsigned long channel);
-  void copyFromChannel (Float32Array destination,
-                        unsigned long channelNumber,
-                        optional unsigned long bufferOffset = 0);
-  void copyToChannel (Float32Array source,
-                      unsigned long channelNumber,
-                      optional unsigned long bufferOffset = 0);
+  undefined copyFromChannel (Float32Array destination,
+                             unsigned long channelNumber,
+                             optional unsigned long bufferOffset = 0);
+  undefined copyToChannel (Float32Array source,
+                           unsigned long channelNumber,
+                           optional unsigned long bufferOffset = 0);
 };
 
 dictionary AudioBufferOptions {
@@ -144,16 +144,16 @@ interface AudioNode : EventTarget {
   AudioNode connect (AudioNode destinationNode,
                      optional unsigned long output = 0,
                      optional unsigned long input = 0);
-  void connect (AudioParam destinationParam, optional unsigned long output = 0);
-  void disconnect ();
-  void disconnect (unsigned long output);
-  void disconnect (AudioNode destinationNode);
-  void disconnect (AudioNode destinationNode, unsigned long output);
-  void disconnect (AudioNode destinationNode,
-                   unsigned long output,
-                   unsigned long input);
-  void disconnect (AudioParam destinationParam);
-  void disconnect (AudioParam destinationParam, unsigned long output);
+  undefined connect (AudioParam destinationParam, optional unsigned long output = 0);
+  undefined disconnect ();
+  undefined disconnect (unsigned long output);
+  undefined disconnect (AudioNode destinationNode);
+  undefined disconnect (AudioNode destinationNode, unsigned long output);
+  undefined disconnect (AudioNode destinationNode,
+                        unsigned long output,
+                        unsigned long input);
+  undefined disconnect (AudioParam destinationParam);
+  undefined disconnect (AudioParam destinationParam, unsigned long output);
   readonly attribute BaseAudioContext context;
   readonly attribute unsigned long numberOfInputs;
   readonly attribute unsigned long numberOfOutputs;
@@ -205,17 +205,17 @@ interface AudioParam {
 [Exposed=Window]
 interface AudioScheduledSourceNode : AudioNode {
   attribute EventHandler onended;
-  void start(optional double when = 0);
-  void stop(optional double when = 0);
+  undefined start(optional double when = 0);
+  undefined stop(optional double when = 0);
 };
 
 [Exposed=Window]
 interface AnalyserNode : AudioNode {
   constructor (BaseAudioContext context, optional AnalyserOptions options = {});
-  void getFloatFrequencyData (Float32Array array);
-  void getByteFrequencyData (Uint8Array array);
-  void getFloatTimeDomainData (Float32Array array);
-  void getByteTimeDomainData (Uint8Array array);
+  undefined getFloatFrequencyData (Float32Array array);
+  undefined getByteFrequencyData (Uint8Array array);
+  undefined getFloatTimeDomainData (Float32Array array);
+  undefined getByteTimeDomainData (Uint8Array array);
   attribute unsigned long fftSize;
   readonly attribute unsigned long frequencyBinCount;
   attribute double minDecibels;
@@ -240,9 +240,9 @@ interface AudioBufferSourceNode : AudioScheduledSourceNode {
   attribute boolean loop;
   attribute double loopStart;
   attribute double loopEnd;
-  void start (optional double when = 0,
-              optional double offset,
-              optional double duration);
+  undefined start (optional double when = 0,
+                   optional double offset,
+                   optional double duration);
 };
 
 dictionary AudioBufferSourceOptions {
@@ -270,8 +270,8 @@ interface AudioListener {
   readonly attribute AudioParam upX;
   readonly attribute AudioParam upY;
   readonly attribute AudioParam upZ;
-  void setPosition (float x, float y, float z);
-  void setOrientation (float x, float y, float z, float xUp, float yUp, float zUp);
+  undefined setPosition (float x, float y, float z);
+  undefined setOrientation (float x, float y, float z, float xUp, float yUp, float zUp);
 };
 
 [Exposed=Window]
@@ -307,9 +307,9 @@ interface BiquadFilterNode : AudioNode {
   readonly attribute AudioParam detune;
   readonly attribute AudioParam Q;
   readonly attribute AudioParam gain;
-  void getFrequencyResponse (Float32Array frequencyHz,
-                             Float32Array magResponse,
-                             Float32Array phaseResponse);
+  undefined getFrequencyResponse (Float32Array frequencyHz,
+                                  Float32Array magResponse,
+                                  Float32Array phaseResponse);
 };
 
 dictionary BiquadFilterOptions : AudioNodeOptions {
@@ -404,9 +404,9 @@ dictionary GainOptions : AudioNodeOptions {
 [Exposed=Window]
 interface IIRFilterNode : AudioNode {
   constructor (BaseAudioContext context, IIRFilterOptions options);
-  void getFrequencyResponse (Float32Array frequencyHz,
-                             Float32Array magResponse,
-                             Float32Array phaseResponse);
+  undefined getFrequencyResponse (Float32Array frequencyHz,
+                                  Float32Array magResponse,
+                                  Float32Array phaseResponse);
 };
 
 dictionary IIRFilterOptions : AudioNodeOptions {
@@ -463,7 +463,7 @@ interface OscillatorNode : AudioScheduledSourceNode {
   attribute OscillatorType type;
   readonly attribute AudioParam frequency;
   readonly attribute AudioParam detune;
-  void setPeriodicWave (PeriodicWave periodicWave);
+  undefined setPeriodicWave (PeriodicWave periodicWave);
 };
 
 dictionary OscillatorOptions : AudioNodeOptions {
@@ -501,8 +501,8 @@ interface PannerNode : AudioNode {
   attribute double coneInnerAngle;
   attribute double coneOuterAngle;
   attribute double coneOuterGain;
-  void setPosition (float x, float y, float z);
-  void setOrientation (float x, float y, float z);
+  undefined setPosition (float x, float y, float z);
+  undefined setOrientation (float x, float y, float z);
 };
 
 dictionary PannerOptions : AudioNodeOptions {
@@ -578,8 +578,8 @@ callback AudioWorkletProcessorConstructor = AudioWorkletProcessor (object option
 
 [Global=(Worklet, AudioWorklet), Exposed=AudioWorklet]
 interface AudioWorkletGlobalScope : WorkletGlobalScope {
-  void registerProcessor (DOMString name,
-                          AudioWorkletProcessorConstructor processorCtor);
+  undefined registerProcessor (DOMString name,
+                               AudioWorkletProcessorConstructor processorCtor);
   readonly attribute unsigned long long currentFrame;
   readonly attribute double currentTime;
   readonly attribute float sampleRate;
diff --git a/tests/wpt/web-platform-tests/interfaces/webauthn.idl b/tests/wpt/web-platform-tests/interfaces/webauthn.idl
index 607c4765485..27638d0ed40 100644
--- a/tests/wpt/web-platform-tests/interfaces/webauthn.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webauthn.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web Authentication: An API for accessing Public Key Credentials - Level 2 (https://w3c.github.io/webauthn/)
 
 [SecureContext, Exposed=Window]
@@ -77,8 +77,8 @@ dictionary PublicKeyCredentialUserEntity : PublicKeyCredentialEntity {
 
 dictionary AuthenticatorSelectionCriteria {
     DOMString                    authenticatorAttachment;
-    boolean                      requireResidentKey = false;
     DOMString                    residentKey;
+    boolean                      requireResidentKey = false;
     DOMString                    userVerification = "preferred";
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/webdriver.idl b/tests/wpt/web-platform-tests/interfaces/webdriver.idl
index 3ab991ba4e1..194e2d806ad 100644
--- a/tests/wpt/web-platform-tests/interfaces/webdriver.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webdriver.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebDriver (https://w3c.github.io/webdriver/)
 
 interface mixin NavigatorAutomationInformation {
diff --git a/tests/wpt/web-platform-tests/interfaces/webgl1.idl b/tests/wpt/web-platform-tests/interfaces/webgl1.idl
index 5edd66e21d0..95a0fa34265 100644
--- a/tests/wpt/web-platform-tests/interfaces/webgl1.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webgl1.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebGL Specification (https://www.khronos.org/registry/webgl/specs/latest/1.0/)
 
 typedef unsigned long  GLenum;
diff --git a/tests/wpt/web-platform-tests/interfaces/webgl2.idl b/tests/wpt/web-platform-tests/interfaces/webgl2.idl
index be9365e3893..b2e660e6b65 100644
--- a/tests/wpt/web-platform-tests/interfaces/webgl2.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webgl2.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebGL 2.0 Specification (https://www.khronos.org/registry/webgl/specs/latest/2.0/)
 
 typedef long long GLint64;
diff --git a/tests/wpt/web-platform-tests/interfaces/webhid.idl b/tests/wpt/web-platform-tests/interfaces/webhid.idl
index 9136e128cd5..38d917e1ec0 100644
--- a/tests/wpt/web-platform-tests/interfaces/webhid.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webhid.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebHID API (https://wicg.github.io/webhid/)
 
 dictionary HIDDeviceFilter {
diff --git a/tests/wpt/web-platform-tests/interfaces/webmidi.idl b/tests/wpt/web-platform-tests/interfaces/webmidi.idl
index 0e390f8bde7..cf08897e99e 100644
--- a/tests/wpt/web-platform-tests/interfaces/webmidi.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webmidi.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Web MIDI API (https://webaudio.github.io/web-midi-api/)
 
 partial interface Navigator {
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
index 28b6a3b2b7f..2af476f4d77 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Identity for WebRTC 1.0 (https://w3c.github.io/webrtc-identity/identity.html)
 
 [Global,
@@ -11,7 +11,7 @@ interface RTCIdentityProviderGlobalScope : WorkerGlobalScope {
 
 [Exposed=RTCIdentityProviderGlobalScope]
 interface RTCIdentityProviderRegistrar {
-    void register(RTCIdentityProvider idp);
+    undefined register(RTCIdentityProvider idp);
 };
 
 dictionary RTCIdentityProvider {
@@ -42,7 +42,7 @@ dictionary RTCIdentityValidationResult {
 };
 
 partial interface RTCPeerConnection {
-    void               setIdentityProvider (DOMString provider, optional RTCIdentityProviderOptions options = {});
+    undefined               setIdentityProvider (DOMString provider, optional RTCIdentityProviderOptions options = {});
     Promise<DOMString> getIdentityAssertion ();
     readonly        attribute Promise<RTCIdentityAssertion> peerIdentity;
     readonly        attribute DOMString?                    idpLoginUrl;
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
index 5a4838f9263..455ab8f18a3 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Identifiers for WebRTC's Statistics API (https://w3c.github.io/webrtc-stats/)
 
 enum RTCStatsType {
@@ -96,10 +96,12 @@ dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  unsigned long        firCount;
  unsigned long        pliCount;
  unsigned long        sliCount;
+ double               totalProcessingDelay;
  DOMHighResTimeStamp  estimatedPlayoutTimestamp;
  double               jitterBufferDelay;
  unsigned long long   jitterBufferEmittedCount;
  unsigned long long   totalSamplesReceived;
+ unsigned long long   totalSamplesDecoded;
  unsigned long long   samplesDecodedWithSilk;
  unsigned long long   samplesDecodedWithCelt;
  unsigned long long   concealedSamples;
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-svc.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-svc.idl
index 2691a87b30d..45469d79467 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-svc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-svc.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Scalable Video Coding (SVC) Extension for WebRTC (https://w3c.github.io/webrtc-svc/)
 
 partial dictionary RTCRtpEncodingParameters {
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc.idl b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
index efb21f4a0cc..841a8b53eaa 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebRTC 1.0: Real-time Communication Between Browsers (https://w3c.github.io/webrtc-pc/)
 
 dictionary RTCConfiguration {
@@ -85,24 +85,24 @@ interface RTCPeerConnection : EventTarget  {
   constructor(optional RTCConfiguration configuration = {});
   Promise<RTCSessionDescriptionInit> createOffer(optional RTCOfferOptions options = {});
   Promise<RTCSessionDescriptionInit> createAnswer(optional RTCAnswerOptions options = {});
-  Promise<void> setLocalDescription(optional RTCLocalSessionDescriptionInit description = {});
+  Promise<undefined> setLocalDescription(optional RTCLocalSessionDescriptionInit description = {});
   readonly attribute RTCSessionDescription? localDescription;
   readonly attribute RTCSessionDescription? currentLocalDescription;
   readonly attribute RTCSessionDescription? pendingLocalDescription;
-  Promise<void> setRemoteDescription(RTCSessionDescriptionInit description);
+  Promise<undefined> setRemoteDescription(RTCSessionDescriptionInit description);
   readonly attribute RTCSessionDescription? remoteDescription;
   readonly attribute RTCSessionDescription? currentRemoteDescription;
   readonly attribute RTCSessionDescription? pendingRemoteDescription;
-  Promise<void> addIceCandidate(optional RTCIceCandidateInit candidate = {});
+  Promise<undefined> addIceCandidate(optional RTCIceCandidateInit candidate = {});
   readonly attribute RTCSignalingState signalingState;
   readonly attribute RTCIceGatheringState iceGatheringState;
   readonly attribute RTCIceConnectionState iceConnectionState;
   readonly attribute RTCPeerConnectionState connectionState;
   readonly attribute boolean? canTrickleIceCandidates;
-  void restartIce();
+  undefined restartIce();
   RTCConfiguration getConfiguration();
-  void setConfiguration(optional RTCConfiguration configuration = {});
-  void close();
+  undefined setConfiguration(optional RTCConfiguration configuration = {});
+  undefined close();
   attribute EventHandler onnegotiationneeded;
   attribute EventHandler onicecandidate;
   attribute EventHandler onicecandidateerror;
@@ -116,25 +116,25 @@ interface RTCPeerConnection : EventTarget  {
   // If these methods are supported
   // they must be implemented as defined
   // in section "Legacy Interface Extensions"
-  Promise<void> createOffer(RTCSessionDescriptionCallback successCallback,
+  Promise<undefined> createOffer(RTCSessionDescriptionCallback successCallback,
                             RTCPeerConnectionErrorCallback failureCallback,
                             optional RTCOfferOptions options = {});
-  Promise<void> setLocalDescription(optional RTCLocalSessionDescriptionInit description = {},
+  Promise<undefined> setLocalDescription(optional RTCLocalSessionDescriptionInit description = {},
                                     VoidFunction successCallback,
                                     RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> createAnswer(RTCSessionDescriptionCallback successCallback,
+  Promise<undefined> createAnswer(RTCSessionDescriptionCallback successCallback,
                              RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> setRemoteDescription(RTCSessionDescriptionInit description,
+  Promise<undefined> setRemoteDescription(RTCSessionDescriptionInit description,
                                      VoidFunction successCallback,
                                      RTCPeerConnectionErrorCallback failureCallback);
-  Promise<void> addIceCandidate(RTCIceCandidateInit candidate,
+  Promise<undefined> addIceCandidate(RTCIceCandidateInit candidate,
                                 VoidFunction successCallback,
                                 RTCPeerConnectionErrorCallback failureCallback);
 };
 
-callback RTCPeerConnectionErrorCallback = void (DOMException error);
+callback RTCPeerConnectionErrorCallback = undefined (DOMException error);
 
-callback RTCSessionDescriptionCallback = void (RTCSessionDescriptionInit description);
+callback RTCSessionDescriptionCallback = undefined (RTCSessionDescriptionInit description);
 
 partial dictionary RTCOfferOptions {
   boolean offerToReceiveAudio;
@@ -261,7 +261,7 @@ partial interface RTCPeerConnection {
   sequence<RTCRtpReceiver> getReceivers();
   sequence<RTCRtpTransceiver> getTransceivers();
   RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
-  void removeTrack(RTCRtpSender sender);
+  undefined removeTrack(RTCRtpSender sender);
   RTCRtpTransceiver addTransceiver((MediaStreamTrack or DOMString) trackOrKind,
                                    optional RTCRtpTransceiverInit init = {});
   attribute EventHandler ontrack;
@@ -286,10 +286,10 @@ interface RTCRtpSender {
   readonly attribute MediaStreamTrack? track;
   readonly attribute RTCDtlsTransport? transport;
   static RTCRtpCapabilities? getCapabilities(DOMString kind);
-  Promise<void> setParameters(RTCRtpSendParameters parameters);
+  Promise<undefined> setParameters(RTCRtpSendParameters parameters);
   RTCRtpSendParameters getParameters();
-  Promise<void> replaceTrack(MediaStreamTrack? withTrack);
-  void setStreams(MediaStream... streams);
+  Promise<undefined> replaceTrack(MediaStreamTrack? withTrack);
+  undefined setStreams(MediaStream... streams);
   Promise<RTCStatsReport> getStats();
 };
 
@@ -383,8 +383,8 @@ interface RTCRtpTransceiver {
   [SameObject] readonly attribute RTCRtpReceiver receiver;
   attribute RTCRtpTransceiverDirection direction;
   readonly attribute RTCRtpTransceiverDirection? currentDirection;
-  void stop();
-  void setCodecPreferences(sequence<RTCRtpCodecCapability> codecs);
+  undefined stop();
+  undefined setCodecPreferences(sequence<RTCRtpCodecCapability> codecs);
 };
 
 [Exposed=Window]
@@ -517,13 +517,13 @@ interface RTCDataChannel : EventTarget {
   attribute EventHandler onerror;
   attribute EventHandler onclosing;
   attribute EventHandler onclose;
-  void close();
+  undefined close();
   attribute EventHandler onmessage;
   attribute DOMString binaryType;
-  void send(USVString data);
-  void send(Blob data);
-  void send(ArrayBuffer data);
-  void send(ArrayBufferView data);
+  undefined send(USVString data);
+  undefined send(Blob data);
+  undefined send(ArrayBuffer data);
+  undefined send(ArrayBufferView data);
 };
 
 dictionary RTCDataChannelInit {
@@ -558,7 +558,7 @@ partial interface RTCRtpSender {
 
 [Exposed=Window]
 interface RTCDTMFSender : EventTarget {
-  void insertDTMF(DOMString tones, optional unsigned long duration = 100, optional unsigned long interToneGap = 70);
+  undefined insertDTMF(DOMString tones, optional unsigned long duration = 100, optional unsigned long interToneGap = 70);
   attribute EventHandler ontonechange;
   readonly attribute boolean canInsertDTMF;
   readonly attribute DOMString toneBuffer;
diff --git a/tests/wpt/web-platform-tests/interfaces/webusb.idl b/tests/wpt/web-platform-tests/interfaces/webusb.idl
index ad5c480454d..44a8bdd04d5 100644
--- a/tests/wpt/web-platform-tests/interfaces/webusb.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webusb.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebUSB API (https://wicg.github.io/webusb/)
 
 dictionary USBDeviceFilter {
@@ -66,20 +66,20 @@ interface USBDevice {
   readonly attribute USBConfiguration? configuration;
   readonly attribute FrozenArray<USBConfiguration> configurations;
   readonly attribute boolean opened;
-  Promise<void> open();
-  Promise<void> close();
-  Promise<void> selectConfiguration(octet configurationValue);
-  Promise<void> claimInterface(octet interfaceNumber);
-  Promise<void> releaseInterface(octet interfaceNumber);
-  Promise<void> selectAlternateInterface(octet interfaceNumber, octet alternateSetting);
+  Promise<undefined> open();
+  Promise<undefined> close();
+  Promise<undefined> selectConfiguration(octet configurationValue);
+  Promise<undefined> claimInterface(octet interfaceNumber);
+  Promise<undefined> releaseInterface(octet interfaceNumber);
+  Promise<undefined> selectAlternateInterface(octet interfaceNumber, octet alternateSetting);
   Promise<USBInTransferResult> controlTransferIn(USBControlTransferParameters setup, unsigned short length);
   Promise<USBOutTransferResult> controlTransferOut(USBControlTransferParameters setup, optional BufferSource data);
-  Promise<void> clearHalt(USBDirection direction, octet endpointNumber);
+  Promise<undefined> clearHalt(USBDirection direction, octet endpointNumber);
   Promise<USBInTransferResult> transferIn(octet endpointNumber, unsigned long length);
   Promise<USBOutTransferResult> transferOut(octet endpointNumber, BufferSource data);
   Promise<USBIsochronousInTransferResult> isochronousTransferIn(octet endpointNumber, sequence<unsigned long> packetLengths);
   Promise<USBIsochronousOutTransferResult> isochronousTransferOut(octet endpointNumber, BufferSource data, sequence<unsigned long> packetLengths);
-  Promise<void> reset();
+  Promise<undefined> reset();
 };
 
 enum USBRequestType {
diff --git a/tests/wpt/web-platform-tests/interfaces/webvtt.idl b/tests/wpt/web-platform-tests/interfaces/webvtt.idl
index 81a23a35be6..eb8d5b5c209 100644
--- a/tests/wpt/web-platform-tests/interfaces/webvtt.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webvtt.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebVTT: The Web Video Text Tracks Format (https://w3c.github.io/webvtt/)
 
 enum AutoKeyword { "auto" };
diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-ar-module.idl b/tests/wpt/web-platform-tests/interfaces/webxr-ar-module.idl
index 097469d400d..c3677fecdce 100644
--- a/tests/wpt/web-platform-tests/interfaces/webxr-ar-module.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webxr-ar-module.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebXR Augmented Reality Module - Level 1 (https://immersive-web.github.io/webxr-ar-module/)
 
 enum XREnvironmentBlendMode {
diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-gamepads-module.idl b/tests/wpt/web-platform-tests/interfaces/webxr-gamepads-module.idl
index 3aa17a7fe0c..f623c632bce 100644
--- a/tests/wpt/web-platform-tests/interfaces/webxr-gamepads-module.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webxr-gamepads-module.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebXR Gamepads Module - Level 1 (https://immersive-web.github.io/webxr-gamepads-module/)
 
 partial interface XRInputSource {
diff --git a/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl b/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl
new file mode 100644
index 00000000000..260c00365ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/webxr-hand-input.idl
@@ -0,0 +1,58 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: WebXR Hand Input Module - Level 1 (https://immersive-web.github.io/webxr-hand-input/)
+
+partial interface XRInputSource {
+   readonly attribute XRHand? hand;
+};
+
+interface XRHand {
+    iterable<XRJointSpace>;
+    readonly attribute unsigned long length;
+    getter XRJointSpace joint(unsigned long jointIndex);
+
+    const unsigned long WRIST = 0;
+
+    const unsigned long THUMB_METACARPAL = 1;
+    const unsigned long THUMB_PHALANX_PROXIMAL = 2;
+    const unsigned long THUMB_PHALANX_DISTAL = 3;
+    const unsigned long THUMB_PHALANX_TIP = 4;
+
+    const unsigned long INDEX_METACARPAL = 5;
+    const unsigned long INDEX_PHALANX_PROXIMAL = 6;
+    const unsigned long INDEX_PHALANX_INTERMEDIATE = 7;
+    const unsigned long INDEX_PHALANX_DISTAL = 8;
+    const unsigned long INDEX_PHALANX_TIP = 9;
+
+    const unsigned long MIDDLE_METACARPAL = 10;
+    const unsigned long MIDDLE_PHALANX_PROXIMAL = 11;
+    const unsigned long MIDDLE_PHALANX_INTERMEDIATE = 12;
+    const unsigned long MIDDLE_PHALANX_DISTAL = 13;
+    const unsigned long MIDDLE_PHALANX_TIP = 14;
+
+    const unsigned long RING_METACARPAL = 15;
+    const unsigned long RING_PHALANX_PROXIMAL = 16;
+    const unsigned long RING_PHALANX_INTERMEDIATE = 17;
+    const unsigned long RING_PHALANX_DISTAL = 18;
+    const unsigned long RING_PHALANX_TIP = 19;
+
+    const unsigned long LITTLE_METACARPAL = 20;
+    const unsigned long LITTLE_PHALANX_PROXIMAL = 21;
+    const unsigned long LITTLE_PHALANX_INTERMEDIATE = 22;
+    const unsigned long LITTLE_PHALANX_DISTAL = 23;
+    const unsigned long LITTLE_PHALANX_TIP = 24;
+};
+
+interface XRJointSpace: XRSpace {};
+
+partial interface XRFrame {
+    XRJointPose? getJointPose(XRJointSpace joint, XRSpace baseSpace);
+    void fillJointRadii(sequence<XRJointSpace> jointSpaces, Float32Array radii);
+
+    void fillPoses(sequence<XRSpace> spaces, XRSpace baseSpace, Float32Array transforms);
+};
+
+interface XRJointPose: XRPose {
+    readonly attribute float? radius;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/webxr.idl b/tests/wpt/web-platform-tests/interfaces/webxr.idl
index b0d94394b5b..81e42e908cb 100644
--- a/tests/wpt/web-platform-tests/interfaces/webxr.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webxr.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: WebXR Device API (https://immersive-web.github.io/webxr/)
 
 partial interface Navigator {
@@ -40,13 +40,13 @@ enum XRVisibilityState {
   [SameObject] readonly attribute XRInputSourceArray inputSources;
 
   // Methods
-  void updateRenderState(optional XRRenderStateInit state = {});
+  undefined updateRenderState(optional XRRenderStateInit state = {});
   [NewObject] Promise<XRReferenceSpace> requestReferenceSpace(XRReferenceSpaceType type);
 
   unsigned long requestAnimationFrame(XRFrameRequestCallback callback);
-  void cancelAnimationFrame(unsigned long handle);
+  undefined cancelAnimationFrame(unsigned long handle);
 
-  Promise<void> end();
+  Promise<undefined> end();
 
   // Events
   attribute EventHandler onend;
@@ -75,7 +75,7 @@ dictionary XRRenderStateInit {
   readonly attribute XRWebGLLayer? baseLayer;
 };
 
-callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRFrame frame);
+callback XRFrameRequestCallback = undefined (DOMHighResTimeStamp time, XRFrame frame);
 
 [SecureContext, Exposed=Window] interface XRFrame {
   [SameObject] readonly attribute XRSession session;
@@ -213,7 +213,7 @@ partial dictionary WebGLContextAttributes {
 };
 
 partial interface mixin WebGLRenderingContextBase {
-    [NewObject] Promise<void> makeXRCompatible();
+    [NewObject] Promise<undefined> makeXRCompatible();
 };
 
 [SecureContext, Exposed=Window]
diff --git a/tests/wpt/web-platform-tests/interfaces/worklets.idl b/tests/wpt/web-platform-tests/interfaces/worklets.idl
index f89eacd50bd..8f5154e8509 100644
--- a/tests/wpt/web-platform-tests/interfaces/worklets.idl
+++ b/tests/wpt/web-platform-tests/interfaces/worklets.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: Worklets Level 1 (https://drafts.css-houdini.org/worklets/)
 
 [Exposed=Worklet]
@@ -9,7 +9,7 @@ interface WorkletGlobalScope {
 
 [Exposed=Window]
 interface Worklet {
-    [NewObject] Promise<void> addModule(USVString moduleURL, optional WorkletOptions options = {});
+    [NewObject] Promise<undefined> addModule(USVString moduleURL, optional WorkletOptions options = {});
 };
 
 dictionary WorkletOptions {
diff --git a/tests/wpt/web-platform-tests/interfaces/xhr.idl b/tests/wpt/web-platform-tests/interfaces/xhr.idl
index d3d0e5378d3..d6d8193e1c3 100644
--- a/tests/wpt/web-platform-tests/interfaces/xhr.idl
+++ b/tests/wpt/web-platform-tests/interfaces/xhr.idl
@@ -1,6 +1,6 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: XMLHttpRequest Standard (https://xhr.spec.whatwg.org/)
 
 [Exposed=(Window,DedicatedWorker,SharedWorker)]
@@ -44,14 +44,14 @@ interface XMLHttpRequest : XMLHttpRequestEventTarget {
   readonly attribute unsigned short readyState;
 
   // request
-  void open(ByteString method, USVString url);
-  void open(ByteString method, USVString url, boolean async, optional USVString? username = null, optional USVString? password = null);
-  void setRequestHeader(ByteString name, ByteString value);
+  undefined open(ByteString method, USVString url);
+  undefined open(ByteString method, USVString url, boolean async, optional USVString? username = null, optional USVString? password = null);
+  undefined setRequestHeader(ByteString name, ByteString value);
            attribute unsigned long timeout;
            attribute boolean withCredentials;
   [SameObject] readonly attribute XMLHttpRequestUpload upload;
-  void send(optional (Document or XMLHttpRequestBodyInit)? body = null);
-  void abort();
+  undefined send(optional (Document or XMLHttpRequestBodyInit)? body = null);
+  undefined abort();
 
   // response
   readonly attribute USVString responseURL;
@@ -59,7 +59,7 @@ interface XMLHttpRequest : XMLHttpRequestEventTarget {
   readonly attribute ByteString statusText;
   ByteString? getResponseHeader(ByteString name);
   ByteString getAllResponseHeaders();
-  void overrideMimeType(DOMString mime);
+  undefined overrideMimeType(DOMString mime);
            attribute XMLHttpRequestResponseType responseType;
   readonly attribute any response;
   readonly attribute USVString responseText;
@@ -72,14 +72,14 @@ typedef (File or USVString) FormDataEntryValue;
 interface FormData {
   constructor(optional HTMLFormElement form);
 
-  void append(USVString name, USVString value);
-  void append(USVString name, Blob blobValue, optional USVString filename);
-  void delete(USVString name);
+  undefined append(USVString name, USVString value);
+  undefined append(USVString name, Blob blobValue, optional USVString filename);
+  undefined delete(USVString name);
   FormDataEntryValue? get(USVString name);
   sequence<FormDataEntryValue> getAll(USVString name);
   boolean has(USVString name);
-  void set(USVString name, USVString value);
-  void set(USVString name, Blob blobValue, optional USVString filename);
+  undefined set(USVString name, USVString value);
+  undefined set(USVString name, Blob blobValue, optional USVString filename);
   iterable<USVString, FormDataEntryValue>;
 };
 
diff --git a/tests/wpt/web-platform-tests/intersection-observer/observer-attributes.html b/tests/wpt/web-platform-tests/intersection-observer/observer-attributes.html
index 4e2e5293c7c..9d0b788b331 100644
--- a/tests/wpt/web-platform-tests/intersection-observer/observer-attributes.html
+++ b/tests/wpt/web-platform-tests/intersection-observer/observer-attributes.html
@@ -15,6 +15,15 @@ test(function() {
   test(function() { assert_equals(observer.rootMargin, "0px 0px 0px 0px") },
        "observer.rootMargin");
 
+  observer = new IntersectionObserver(function(e) {}, {
+    rootMargin: " ",
+    threshold: []
+  });
+  test(function() { assert_array_equals(observer.thresholds, [0]) },
+       "empty observer.thresholds");
+  test(function() { assert_equals(observer.rootMargin, "0px 0px 0px 0px") },
+       "whitespace observer.rootMargin");
+
   var rootDiv = document.getElementById("root");
   observer = new IntersectionObserver(function(e) {}, {
     root: rootDiv,
diff --git a/tests/wpt/web-platform-tests/is-input-pending/README.md b/tests/wpt/web-platform-tests/is-input-pending/README.md
new file mode 100644
index 00000000000..7994b1a4ec3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/README.md
@@ -0,0 +1,3 @@
+- `security/` contains tests intended to ensure that input is not detectable cross-origin.
+- `tentative/` contains tests to detect common cases where it may be beneficial to pending input.
+  - All positive tests are marked as tentative, as the spec permits UAs to omit reporting pending input.
diff --git a/tests/wpt/web-platform-tests/is-input-pending/resources/blank.html b/tests/wpt/web-platform-tests/is-input-pending/resources/blank.html
new file mode 100644
index 00000000000..f27d7148d3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/resources/blank.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<script src="input-onmessage.js"></script>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/resources/input-onmessage.js b/tests/wpt/web-platform-tests/is-input-pending/resources/input-onmessage.js
new file mode 100644
index 00000000000..eeaa82841ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/resources/input-onmessage.js
@@ -0,0 +1,25 @@
+// Responds to onmessage events from other frames to check for pending input.
+onmessage = async e => {
+  if (e.data !== 'check-input') return;
+
+  const discreteOptions = new IsInputPendingOptions({ includeContinuous: false });
+  const continuousOptions = new IsInputPendingOptions({ includeContinuous: true });
+
+  // Use a reasonable time to wait after dispatching events, since we want to be
+  // able to test for cases where isInputPending returns false.
+  const DISPATCH_WAIT_TIME_MS = 200;
+
+  // Wait a reasonable amount of time for the event to be enqueued.
+  const end = performance.now() + DISPATCH_WAIT_TIME_MS;
+  let hasDiscrete;
+  let hasContinuous;
+  do {
+    hasDiscrete = navigator.scheduling.isInputPending(discreteOptions);
+    hasContinuous = navigator.scheduling.isInputPending(continuousOptions);
+  } while (performance.now() < end && !(hasDiscrete && hasContinuous));
+
+  e.source.postMessage({
+    discrete: hasDiscrete,
+    continuous: hasContinuous,
+  }, '*');
+}
diff --git a/tests/wpt/web-platform-tests/is-input-pending/resources/pending-input-utils.js b/tests/wpt/web-platform-tests/is-input-pending/resources/pending-input-utils.js
new file mode 100644
index 00000000000..489c16827a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/resources/pending-input-utils.js
@@ -0,0 +1,68 @@
+// Dispatches the given sequence of actions and verifies isInputPending state
+// after dispatch according to expectations. Returns when all dispatched input
+// has been handled.
+const pendingActionTest = async (label, target, actionCallback, expectations) => {
+  promise_test(async () => {
+    // Give focus to the page first, before running the test.
+    await new test_driver.Actions()
+      .pointerMove(0, 0)
+      .pointerDown()
+      .pointerUp()
+      .send();
+
+    // Register a handler to fetch the result of isInputPending from the target
+    // window.
+    const resultPromise = new Promise(res => {
+      window.addEventListener('message', function handler(e) {
+        if (e.data === 'check-input') return;
+        res(e.data);
+        window.removeEventListener('message', handler);
+      });
+    });
+
+    // Signal to the target window to monitor isInputPending.
+    target.postMessage('check-input', '*');
+
+    const actions = actionCallback();
+    const actionsPromise = actions.send();
+
+    const {discrete, continuous} = await resultPromise;
+
+    assert_equals(discrete, expectations.discrete, 'detected discrete input');
+    assert_equals(continuous, expectations.continuous, 'detected continuous input');
+
+    await actionsPromise;
+  }, label);
+}
+
+const PendingInputUtils = {
+  testDetectNoPendingInput(target, actionCallback, label) {
+    pendingActionTest(label, target, actionCallback, {
+      discrete: false,
+      continuous: false,
+    });
+  },
+
+  testDetectDiscretePendingInput(target, actionCallback, label) {
+    pendingActionTest(label, target, actionCallback, {
+      discrete: true,
+      continuous: true,
+    });
+  },
+
+  testDetectContinuousPendingInput(target, actionCallback, label) {
+    pendingActionTest(label, target, actionCallback, {
+      discrete: false,
+      continuous: true,
+    });
+  },
+
+  // Simulates a pointer event at the given coordinates, and tests that the
+  // given target window cannot access it. Intended for cross-origin compliance
+  // tests.
+  testCannotAccessPendingInputAt(target, x, y, label) {
+    PendingInputUtils.testDetectNoPendingInput(target, () => {
+      return new test_driver.Actions().pointerMove(x, y).pointerDown().pointerUp();
+    }, label);
+  },
+}
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html
new file mode 100644
index 00000000000..0bbe9c07820
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-complex-clip.sub.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+iframe {
+  clip-path: ellipse(160px 90px);
+}
+</style>
+</head>
+<body>
+  <div class="obscurer"></div>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that a parent frame cannot detect events on a cross-origin subframe with a complex clip.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 160, 90, 'parent cannot detect cross-origin events');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html
new file mode 100644
index 00000000000..e5a3d310a9a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-complex-clip.sub.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+.obscurer {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 320px;
+  height: 180px;
+  background-color: rgba(0, 0, 255, 0.25);
+  clip-path: ellipse(160px 90px);
+}
+</style>
+</head>
+<body>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <div class="obscurer"></div>
+  <p>Ensure that a parent frame cannot detect events on a cross-origin subframe masked by a div with a complex clip.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 10, 10, 'parent cannot detect cross-origin events outside of clip');
+      PendingInputUtils.testCannotAccessPendingInputAt(frames[0], 50, 50, 'subframe cannot detect events inside of clip');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html
new file mode 100644
index 00000000000..55cbc48b7d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed-2.sub.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+.obscurer {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 160px;
+  height: 180px;
+  background-color: rgba(0, 0, 255, 0.25);
+}
+
+.obscurer > * {
+  position: absolute;
+  left: 160px;
+  width: 160px;
+  height: 90px;
+  pointer-events: none;
+  background-color: rgba(255, 0, 0, 0.25);
+}
+
+</style>
+</head>
+<body>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <div class="obscurer">
+    <div></div>
+  </div>
+  <p>Ensure that a parent frame cannot detect events on top of a cross-origin subframe masked by a div with a `pointer-events: none` child.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 180, 120, 'parent cannot detect cross-origin events in `pointer-events: none` region');
+      PendingInputUtils.testCannotAccessPendingInputAt(frames[0], 10, 10, 'subframe cannot detect events in `pointer-events: initial` region');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html
new file mode 100644
index 00000000000..b0363682ef4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-mixed.sub.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+.obscurer {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 320px;
+  height: 180px;
+  pointer-events: none;
+  background-color: rgba(0, 0, 255, 0.25);
+}
+
+.obscurer > * {
+  width: 160px;
+  height: 180px;
+  pointer-events: initial;
+  background-color: rgba(255, 0, 0, 0.25);
+}
+
+</style>
+</head>
+<body>
+  <div class="obscurer">
+    <div></div>
+  </div>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that a parent frame cannot can events on top of a cross-origin subframe masked by a div with `pointer-events: none` and a `pointer-events: initial` child.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 180, 10, 'cannot detect cross-origin events in `pointer-events: none` region');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html
new file mode 100644
index 00000000000..a3f971cdfd2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-masked-pointer-events-none.sub.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+.obscurer {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  width: 320px;
+  height: 180px;
+  pointer-events: none;
+  background-color: rgba(0, 0, 255, 0.25);
+}
+</style>
+</head>
+<body>
+  <div class="obscurer"></div>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that a parent frame cannot detect events on a cross-origin subframe masked by a div with `pointer-events: none`.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 10, 10, 'parent cannot detect events');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html
new file mode 100644
index 00000000000..377eedbf35e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-overlap.sub.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+.occluding {
+  margin-left: -100px;
+}
+</style>
+</head>
+<body>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <iframe class="occluding" src="http://{{hosts[][www2]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that two overlapping subframes cannot detect events from each other.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 280, 10, 'parent cannot detect input on occluding iframe');
+      PendingInputUtils.testCannotAccessPendingInputAt(frames[0], 280, 10, 'occluded iframe cannot detect input on occluding iframe');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html
new file mode 100644
index 00000000000..371a92866a6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-pointer-events-none.sub.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+iframe {
+  pointer-events: none;
+}
+</style>
+</head>
+<body>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that a subframe cannot detect events if it has `pointer-events: none`.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(frames[0], 10, 10, 'iframe cannot detect events with pointer-events: none');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html
new file mode 100644
index 00000000000..5dac5aa36b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe-transformed.sub.html
@@ -0,0 +1,27 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+<style>
+iframe {
+  transform: rotateZ(-45deg);
+}
+</style>
+</head>
+<body>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that a parent frame cannot detect events on a cross-origin subframe when the subframe does not intersect and is not an axis-aligned rect.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 100, 50, 'parent cannot detect input inside of iframe bounds');
+      PendingInputUtils.testCannotAccessPendingInputAt(frames[0], 10, 10, 'subframe cannot detect input outside of iframe bounds');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe.sub.html b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe.sub.html
new file mode 100644
index 00000000000..d513fa94fc4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/security/cross-origin-subframe.sub.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+</head>
+<body>
+  <iframe src="http://{{hosts[][www1]}}:{{ports[http][0]}}/is-input-pending/resources/blank.html"></iframe>
+  <p>Ensure that a parent frame cannot detect events on a cross-origin subframe.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testCannotAccessPendingInputAt(window, 10, 10, 'cannot detect cross-origin events on subframe');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/tentative/same-origin-subframe.sub.html b/tests/wpt/web-platform-tests/is-input-pending/tentative/same-origin-subframe.sub.html
new file mode 100644
index 00000000000..ee85bc4d06e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/tentative/same-origin-subframe.sub.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+</head>
+<body>
+  <iframe src="../resources/blank.html"></iframe>
+  <p>Ensure that a parent frame can detect events on one of its same-origin subframes.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testDetectDiscretePendingInput(window, () => {
+        return new test_driver.Actions()
+          .pointerMove(10, 10)
+          .pointerDown()
+          .pointerUp();
+      }, 'can detect same-origin iframe events in parent');
+      PendingInputUtils.testDetectDiscretePendingInput(frames[0], () => {
+        return new test_driver.Actions()
+          .pointerMove(10, 10)
+          .pointerDown()
+          .pointerUp();
+      }, 'can detect same-origin iframe events in subframe');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/is-input-pending/tentative/toplevel.html b/tests/wpt/web-platform-tests/is-input-pending/tentative/toplevel.html
new file mode 100644
index 00000000000..4b60571d53c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/is-input-pending/tentative/toplevel.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/input-onmessage.js"></script>
+<script src="../resources/pending-input-utils.js"></script>
+</head>
+<body>
+  <p>Ensure that pointer events dispatched the to the toplevel document are detectable by isInputPending.</p>
+  <script>
+    window.addEventListener('load', () => {
+      PendingInputUtils.testDetectDiscretePendingInput(window, () => {
+        return new test_driver.Actions()
+          .addPointer('p', 'mouse')
+          .pointerMove(10, 10)
+          .pointerDown()
+          .pointerUp();
+      }, 'toplevel mouse events detected');
+    });
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js
new file mode 100644
index 00000000000..5095ca7d41e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-reference.optional.any.js
@@ -0,0 +1,50 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-finalization-registry.prototype.cleanupSome
+info: |
+  FinalizationRegistry.prototype.cleanupSome ( [ callback ] )
+
+  1. Let finalizationRegistry be the this value.
+  2. If Type(finalizationRegistry) is not Object, throw a TypeError exception.
+  3. If finalizationRegistry does not have a [[Cells]] internal slot, throw a TypeError exception.
+  4. If callback is not undefined and IsCallable(callback) is false, throw a TypeError exception.
+  5. Perform ? CleanupFinalizationRegistry(finalizationRegistry, callback).
+  6. Return undefined.
+---*/
+
+let holdingsList = [];
+function cb(holding) {
+  holdingsList.push(holding);
+};
+let finalizationRegistry = new FinalizationRegistry(function() {});
+
+let referenced = {};
+
+function emptyCells() {
+  let target = {};
+  finalizationRegistry.register(target, 'target!');
+  finalizationRegistry.register(referenced, 'referenced');
+
+  let prom = maybeGarbageCollectAndCleanupAsync(target);
+  target = null;
+
+  return prom;
+}
+
+promise_test(() => {
+  return (async () => {
+    assert_implements(
+      typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+      'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+    );
+
+    await emptyCells();
+    finalizationRegistry.cleanupSome(cb);
+
+    assert_equals(holdingsList.length, 1);
+    assert_equals(holdingsList[0], 'target!');
+    assert_equals(typeof referenced, 'object', 'referenced preserved');
+  })().catch(resolveGarbageCollection);
+}, 'cleanupCallback has only one optional chance to be called for a GC that cleans up a registered target.');
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js
new file mode 100644
index 00000000000..0dcfcbfbd02
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/cleanup-prevented-with-unregister.optional.any.js
@@ -0,0 +1,57 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-finalization-registry.prototype.cleanupSome
+info: |
+  FinalizationRegistry.prototype.cleanupSome ( [ callback ] )
+
+  1. Let finalizationRegistry be the this value.
+  2. If Type(finalizationRegistry) is not Object, throw a TypeError exception.
+  3. If finalizationRegistry does not have a [[Cells]] internal slot, throw a TypeError exception.
+  4. If callback is not undefined and IsCallable(callback) is false, throw a TypeError exception.
+  5. Perform ? CleanupFinalizationRegistry(finalizationRegistry, callback).
+  6. Return undefined.
+
+  FinalizationRegistry.prototype.unregister ( unregisterToken )
+
+  1. Let removed be false.
+  2. For each Record { [[Target]], [[Holdings]], [[UnregisterToken]] } cell that is an element of finalizationRegistry.[[Cells]], do
+    a. If SameValue(cell.[[UnregisterToken]], unregisterToken) is true, then
+      i. Remove cell from finalizationRegistry.[[Cells]].
+      ii. Set removed to true.
+  3. Return removed.
+---*/
+let token = {};
+let finalizationRegistry = new FinalizationRegistry(function() {});
+
+function emptyCells() {
+  let target = {};
+  finalizationRegistry.register(target, 'target!', token);
+
+  let prom = maybeGarbageCollectAndCleanupAsync(target);
+  target = null;
+
+  return prom;
+}
+
+promise_test(() => {
+  return (async () => {
+    assert_implements(
+      typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+      'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+    );
+
+    await emptyCells();
+    let called = 0;
+
+    let res = finalizationRegistry.unregister(token);
+    assert_equals(res, true, 'unregister target before iterating over it in cleanup');
+
+    finalizationRegistry.cleanupSome((holding) => {
+      called += 1;
+    });
+
+    assert_equals(called, 0, 'callback was not called');
+  })().catch(resolveGarbageCollection);
+}, 'Cleanup might be prevented with an unregister usage');
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js
new file mode 100644
index 00000000000..9a1d0a5c1a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/gc-has-one-chance-to-call-cleanupCallback.optional.any.js
@@ -0,0 +1,100 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// ├──> maybeGarbageCollectAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-finalization-registry-target
+info: |
+  FinalizationRegistry ( cleanupCallback )
+
+  FinalizationRegistry.prototype.cleanupSome ( [ callback ] )
+
+  ...
+  4. If callback is not undefined and IsCallable(callback) is false, throw a TypeError exception.
+  5. Perform ? CleanupFinalizationRegistry(finalizationRegistry, callback).
+  6. Return undefined.
+
+  Execution
+
+  At any time, if an object obj is not live, an ECMAScript implementation may perform the following steps atomically:
+
+  1. For each WeakRef ref such that ref.[[Target]] is obj,
+    a. Set ref.[[Target]] to empty.
+  2. For each FinalizationRegistry finalizationRegistry such that finalizationRegistry.[[Cells]] contains cell, such that cell.[[Target]] is obj,
+    a. Set cell.[[Target]] to empty.
+    b. Optionally, perform ! HostCleanupFinalizationRegistry(finalizationRegistry).
+---*/
+
+
+let cleanupCallback = 0;
+let called = 0;
+function cb(holding) {
+  assert_equals(holding, 'a');
+  called += 1;
+}
+
+let finalizationRegistry = new FinalizationRegistry(function() {
+  cleanupCallback += 1;
+});
+
+function emptyCells() {
+  let target = {};
+  finalizationRegistry.register(target, 'a');
+
+  let prom = maybeGarbageCollectAndCleanupAsync(target);
+  target = null;
+
+  return prom;
+}
+
+promise_test(() => {
+  return (async () => {
+    assert_implements(
+      typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+      'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+    );
+
+    let ticks = 0;
+    await emptyCells();
+    await ticks++;
+
+    finalizationRegistry.cleanupSome(cb);
+
+    // cleanupSome will be invoked if there are empty cells left. If the
+    // cleanupCallback already ran, then cb won't be called.
+    let expectedCalled = cleanupCallback === 1 ? 0 : 1;
+    // This asserts the registered object was emptied in the previous GC.
+    assert_equals(called, expectedCalled, 'cleanupSome callback for the first time');
+
+    // At this point, we can't assert if cleanupCallback was called, because it's
+    // optional. Although, we can finally assert it's not gonna be called anymore
+    // for the other executions of the Garbage Collector.
+    // The chance of having it called only happens right after the
+    // cell.[[Target]] is set to empty.
+    assert_true(cleanupCallback >= 0, 'cleanupCallback might be 0');
+    assert_true(cleanupCallback <= 1, 'cleanupCallback might be 1');
+
+    // Restoring the cleanupCallback variable to 0 will help us asserting the
+    // finalizationRegistry callback is not called again.
+    cleanupCallback = 0;
+
+    await maybeGarbageCollectAsync();
+    await ticks++;
+
+    finalizationRegistry.cleanupSome(cb);
+
+    assert_equals(called, expectedCalled, 'cleanupSome callback is not called anymore, no empty cells');
+    assert_equals(cleanupCallback, 0, 'cleanupCallback is not called again #1');
+
+    await maybeGarbageCollectAsync();
+    await ticks++;
+
+    finalizationRegistry.cleanupSome(cb);
+
+    assert_equals(called, expectedCalled, 'cleanupSome callback is not called again #2');
+    assert_equals(cleanupCallback, 0, 'cleanupCallback is not called again #2');
+    await maybeGarbageCollectAsync();
+
+    assert_equals(ticks, 3, 'ticks is 3');
+  })().catch(resolveGarbageCollection);
+}, 'cleanupCallback has only one optional chance to be called for a GC that cleans up a registered target.');
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js
new file mode 100644
index 00000000000..591a94d35a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/holdings-multiple-values.optional.any.js
@@ -0,0 +1,65 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-properties-of-the-finalization-registry-constructor
+info: |
+  FinalizationRegistry.prototype.cleanupSome ( [ callback ] )
+
+  1. Let finalizationRegistry be the this value.
+  ...
+  5. Perform ! CleanupFinalizationRegistry(finalizationRegistry, callback).
+  ...
+
+  CleanupFinalizationRegistry ( finalizationRegistry [ , callback ] )
+
+  ...
+  3. While finalizationRegistry.[[Cells]] contains a Record cell such that cell.[[WeakRefTarget]] is ~empty~, then an implementation may perform the following steps,
+    a. Choose any such cell.
+    b. Remove cell from finalizationRegistry.[[Cells]].
+    c. Perform ? Call(callback, undefined, << cell.[[HeldValue]] >>).
+
+---*/
+
+function check(value, expectedName) {
+  let holdings = [];
+  let called = 0;
+  let finalizationRegistry = new FinalizationRegistry(function() {});
+
+  function callback(holding) {
+    called += 1;
+    holdings.push(holding);
+  }
+
+  // This is internal to avoid conflicts
+  function emptyCells(value) {
+    let target = {};
+    finalizationRegistry.register(target, value);
+
+    let prom = maybeGarbageCollectAndCleanupAsync(target);
+    target = null;
+
+    return prom;
+  }
+
+  return emptyCells(value).then(function() {
+    finalizationRegistry.cleanupSome(callback);
+    assert_equals(called, 1, expectedName);
+    assert_equals(holdings.length, 1, expectedName);
+    assert_equals(holdings[0], value, expectedName);
+  });
+}
+
+test(() =>
+  assert_implements(
+  typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+  'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+), 'Requires FinalizationRegistry.prototype.cleanupSome');
+promise_test(() => check(undefined, 'undefined'), '`undefined` as registered holding value');
+promise_test(() => check(null, 'null'), '`null` as registered holding value');
+promise_test(() => check('', 'the empty string'), '`""` as registered holding value');
+promise_test(() => check({}, 'object'), '`{}` as registered holding value');
+promise_test(() => check(42, 'number'), '`42` as registered holding value');
+promise_test(() => check(true, 'true'), '`true` as registered holding value');
+promise_test(() => check(false, 'false'), '`false` as registered holding value');
+promise_test(() => check(Symbol(1), 'symbol'), '`Symbol(1)` as registered holding value');
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/reentrancy.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/reentrancy.optional.any.js
new file mode 100644
index 00000000000..b332b282322
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/reentrancy.optional.any.js
@@ -0,0 +1,50 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-properties-of-the-finalization-registry-constructor
+---*/
+
+let called = 0;
+let endOfCall = 0;
+let finalizationRegistry = new FinalizationRegistry(function() {});
+
+function callback(holding) {
+  called += 1;
+
+  if (called === 1) {
+    // Atempt to re-enter the callback.
+    let nestedCallbackRan = false;
+    finalizationRegistry.cleanupSome(() => { nestedCallbackRan = true });
+    assert_equals(nestedCallbackRan, true);
+  }
+
+  endOfCall += 1;
+}
+
+function emptyCells() {
+  let o1 = {};
+  let o2 = {};
+  // Register more than one objects to test reentrancy.
+  finalizationRegistry.register(o1, 'holdings 1');
+  finalizationRegistry.register(o2, 'holdings 2');
+
+  let prom = maybeGarbageCollectAndCleanupAsync(o1);
+  o1 = null;
+
+  return prom;
+}
+
+promise_test(() => {
+  return (async () => {
+    assert_implements(
+      typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+      'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+    );
+    await emptyCells();
+    finalizationRegistry.cleanupSome(callback);
+
+    assert_equals(called, 1, 'callback was called');
+    assert_equals(endOfCall, 1, 'callback finished');
+  })().catch(resolveGarbageCollection);
+}, 'cleanupCallback has only one optional chance to be called for a GC that cleans up a registered target.');
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js
new file mode 100644
index 00000000000..b7a3431f7bf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/resources/maybe-garbage-collect.js
@@ -0,0 +1,96 @@
+/**
+ * maybeGarbageCollectAsync
+ *
+ * It might garbage collect, it might not. If it doesn't, that's ok.
+ *
+ * Based on "(default export)" in
+ * https://github.com/web-platform-tests/wpt/pull/22835/files#diff-fba53ea423a12f40917f41ba4ffadf1e, and "$262.gc()"
+ * defined in https://github.com/tc39/test262/blob/main/INTERPRETING.md
+ *
+ *
+ * @return {undefined}
+ */
+async function maybeGarbageCollectAsync() {
+  if (typeof TestUtils !== 'undefined' && TestUtils.gc) {
+    await TestUtils.gc();
+  } else if (self.gc) {
+    // Use --expose_gc for V8 (and Node.js)
+    // to pass this flag at chrome launch use: --js-flags="--expose-gc"
+    // Exposed in SpiderMonkey shell as well
+    await self.gc();
+  } else if (self.GCController) {
+    // Present in some WebKit development environments
+    await GCController.collect();
+  }
+  /* eslint-disable no-console */
+  console.warn('Tests are running without the ability to do manual ' +
+               'garbage collection. They will still work, but ' +
+               'coverage will be suboptimal.');
+  /* eslint-enable no-console */
+}
+
+/**
+ * maybeGarbageCollectKeptObjectsAsync
+ *
+ * Based on "asyncGCDeref" in https://github.com/tc39/test262/blob/master/harness/async-gc.js
+ *
+ * @return {Promise} Resolves to a trigger if ClearKeptObjects
+ *                   exists to provide one
+ */
+async function maybeGarbageCollectKeptObjectsAsync() {
+  let trigger;
+
+  if (typeof ClearKeptObjects === 'function') {
+    trigger = ClearKeptObjects();
+  }
+
+  await maybeGarbageCollectAsync();
+
+  return trigger;
+}
+
+/**
+ * maybeGarbageCollectAndCleanupAsync
+ *
+ * Based on "asyncGC" in https://github.com/tc39/test262/blob/master/harness/async-gc.js
+ *
+ * @return {undefined}
+ */
+async function maybeGarbageCollectAndCleanupAsync(...targets) {
+  let finalizationRegistry = new FinalizationRegistry(() => {});
+  let length = targets.length;
+
+  for (let target of targets) {
+    finalizationRegistry.register(target, 'target');
+    target = null;
+  }
+
+  targets = null;
+
+  await 'tick';
+  await maybeGarbageCollectKeptObjectsAsync();
+
+  let names = [];
+
+  finalizationRegistry.cleanupSome(name => names.push(name));
+
+  if (names.length !== length) {
+    throw maybeGarbageCollectAndCleanupAsync.NOT_COLLECTED;
+  }
+}
+
+maybeGarbageCollectAndCleanupAsync.NOT_COLLECTED = Symbol('Object was not collected');
+
+/**
+ * resolveGarbageCollection
+ *
+ * Based on "resolveAsyncGC" in https://github.com/tc39/test262/blob/master/harness/async-gc.js
+ *
+ * @param  {Error} error An error object.
+ * @return {undefined}
+ */
+function resolveGarbageCollection(error) {
+  if (error && error !== maybeGarbageCollectAndCleanupAsync.NOT_COLLECTED) {
+    throw error;
+  }
+}
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js
new file mode 100644
index 00000000000..2ec75a0ccf1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/return-undefined-with-gc.optional.any.js
@@ -0,0 +1,78 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-finalization-registry.prototype.cleanupSome
+info: |
+  FinalizationRegistry.prototype.cleanupSome ( [ callback ] )
+
+  1. Let finalizationRegistry be the this value.
+  2. If Type(finalizationRegistry) is not Object, throw a TypeError exception.
+  3. If finalizationRegistry does not have a [[Cells]] internal slot, throw a TypeError exception.
+  4. If callback is not undefined and IsCallable(callback) is false, throw a TypeError exception.
+  5. Perform ? CleanupFinalizationRegistry(finalizationRegistry, callback).
+  6. Return undefined.
+---*/
+
+let called;
+let fn = function() {
+  called += 1;
+  return 39;
+};
+let cb = function() {
+  called += 1;
+  return 42;
+};
+let finalizationRegistry = new FinalizationRegistry(fn);
+
+function emptyCells() {
+  let target = {};
+  finalizationRegistry.register(target);
+
+  let prom = maybeGarbageCollectAndCleanupAsync(target);
+  target = null;
+
+  return prom;
+}
+
+promise_test(() => {
+  return (async () => {
+    assert_implements(
+      typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+      'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+    );
+
+    await emptyCells();
+    called = 0;
+    assert_equals(finalizationRegistry.cleanupSome(cb), undefined, 'regular callback');
+    assert_equals(called, 1);
+
+    await emptyCells();
+    called = 0;
+    assert_equals(finalizationRegistry.cleanupSome(fn), undefined, 'regular callback, same FG cleanup function');
+    assert_equals(called, 1);
+
+    await emptyCells();
+    called = 0;
+    assert_equals(finalizationRegistry.cleanupSome(), undefined, 'undefined (implicit) callback, defer to FB callback');
+    assert_equals(called, 1);
+
+    await emptyCells();
+    called = 0;
+    assert_equals(finalizationRegistry.cleanupSome(undefined), undefined, 'undefined (explicit) callback, defer to FB callback');
+    assert_equals(called, 1);
+
+    await emptyCells();
+    assert_equals(finalizationRegistry.cleanupSome(() => 1), undefined, 'arrow function');
+
+    await emptyCells();
+    assert_equals(finalizationRegistry.cleanupSome(async function() {}), undefined, 'async function');
+
+    await emptyCells();
+    assert_equals(finalizationRegistry.cleanupSome(function *() {}), undefined, 'generator');
+
+    await emptyCells();
+    assert_equals(finalizationRegistry.cleanupSome(async function *() {}), undefined, 'async generator');
+
+  })().catch(resolveGarbageCollection);
+}, 'Return undefined regardless the result of CleanupFinalizationRegistry');
diff --git a/tests/wpt/web-platform-tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js b/tests/wpt/web-platform-tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js
new file mode 100644
index 00000000000..c653108cb12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/js/builtins/weakrefs/unregister-cleaned-up-cell.optional.any.js
@@ -0,0 +1,72 @@
+// META: script=resources/maybe-garbage-collect.js
+// ├──> maybeGarbageCollectAndCleanupAsync
+// └──> resolveGarbageCollection
+/*---
+esid: sec-finalization-registry.prototype.unregister
+info: |
+  FinalizationRegistry.prototype.cleanupSome ( [ callback ] )
+
+  1. Let finalizationRegistry be the this value.
+  ...
+  5. Perform ! CleanupFinalizationRegistry(finalizationRegistry, callback).
+  ...
+
+  CleanupFinalizationRegistry ( finalizationRegistry [ , callback ] )
+
+  ...
+  3. While finalizationRegistry.[[Cells]] contains a Record cell such that cell.[[WeakRefTarget]] is ~empty~, then an implementation may perform the following steps,
+    a. Choose any such cell.
+    b. Remove cell from finalizationRegistry.[[Cells]].
+    c. Perform ? Call(callback, undefined, << cell.[[HeldValue]] >>).
+  ...
+
+  FinalizationRegistry.prototype.unregister ( unregisterToken )
+
+  1. Let removed be false.
+  2. For each Record { [[Target]], [[Holdings]], [[UnregisterToken]] } cell that is an element of finalizationRegistry.[[Cells]], do
+    a. If SameValue(cell.[[UnregisterToken]], unregisterToken) is true, then
+      i. Remove cell from finalizationRegistry.[[Cells]].
+      ii. Set removed to true.
+  3. Return removed.
+
+---*/
+
+let value = 'target!';
+let token = {};
+let finalizationRegistry = new FinalizationRegistry(function() {});
+
+function emptyCells() {
+  let target = {};
+  finalizationRegistry.register(target, value, token);
+
+  let prom = maybeGarbageCollectAndCleanupAsync(target);
+  target = null;
+
+  return prom;
+}
+
+promise_test(() => {
+  return (async () => {
+    assert_implements(
+      typeof FinalizationRegistry.prototype.cleanupSome === 'function',
+      'FinalizationRegistry.prototype.cleanupSome is not implemented.'
+    );
+
+    await emptyCells();
+    let called = 0;
+    let holdings = [];
+    finalizationRegistry.cleanupSome((holding) => {
+      called += 1;
+      holdings.push(holding);
+    });
+
+    assert_equals(called, 1);
+    assert_equals(holdings.length, 1);
+    assert_equals(holdings[0], value);
+
+    let res = finalizationRegistry.unregister(token);
+    assert_equals(res, false, 'unregister after iterating over it in cleanup');
+
+  })().catch(resolveGarbageCollection);
+}, 'Cannot unregister a cell that has been cleaned up');
+
diff --git a/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-one-line.html b/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-one-line.html
new file mode 100644
index 00000000000..0c477e0e980
--- /dev/null
+++ b/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-one-line.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<title>Layout Instability: inline/text movement is detected</title>
+<link rel="help" href="https://wicg.github.io/layout-instability/" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/util.js"></script>
+<div style="width: 200px; font-size: 20px; line-height: 25px">
+  1AAAAAAA<br>
+  2AAAAAAA<br>
+  3AAAAAAA<br>
+  <div id="inline-block" style="display: inline-block">4AAAAAAA</div><br>
+  <div id="shift" style="display: inline-block"></div>5AAAAAAA<br>
+  6AAAAAAA<br>
+  7AAAAAAA<br>
+</div>
+<script>
+
+promise_test(async () => {
+  const watcher = new ScoreWatcher;
+
+  // Wait for the initial render to complete.
+  await waitForAnimationFrames(2);
+
+  // Modify the width of |shift|.
+  document.querySelector("#shift").style.width = '50px';
+
+  // Only the line after |shift| is shifted right by 50px.
+  // The implementation may measure the real width of the shifted text
+  // or use the available width (i.e. width of the containing block).
+  // Also tolerate extra 10% error.
+  const text_width = document.querySelector("#inline-block").clientWidth;
+  const expectedScoreMin = computeExpectedScore((text_width + 50) * 20, 50) * 0.9;
+  const expectedScoreMax = computeExpectedScore(200 * 25, 50) * 1.1;
+
+  // Observer fires after the frame is painted.
+  assert_equals(watcher.score, 0);
+  await watcher.promise;
+  assert_between_exclusive(watcher.score, expectedScoreMin, expectedScoreMax);
+}, 'Inline flow movement.');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-vertical-rl.html b/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-vertical-rl.html
index a89cad145b2..848883755c7 100644
--- a/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-vertical-rl.html
+++ b/tests/wpt/web-platform-tests/layout-instability/inline-flow-shift-vertical-rl.html
@@ -31,8 +31,8 @@ promise_test(async () => {
   // or use the available width (i.e. width of the containing block).
   // Also tolerate extra 10% error.
   const text_width = inline_block.offsetWidth;
-  const expectedScoreMin = computeExpectedScore(text_width * (30 * 3 + 50), 50) * 0.9;
-  const expectedScoreMax = computeExpectedScore(200 * (30 * 3 + 50), 50) * 1.1;
+  const expectedScoreMin = computeExpectedScore(text_width * (20 * 3 + 50), 50) * 0.9;
+  const expectedScoreMax = computeExpectedScore(200 * (25 * 3 + 50), 50) * 1.1;
 
   // Observer fires after the frame is painted.
   assert_equals(watcher.score, 0);
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index a17a09402e0..a3b91f1a992 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -106,6 +106,7 @@ PRINT STATEMENT: webdriver/tests/support/helpers.py
 
 # semi-legitimate use of console.*
 CONSOLE: console/*
+CONSOLE: js/builtins/weakrefs/resources/maybe-garbage-collect.js
 CONSOLE: resources/check-layout-th.js
 CONSOLE: resources/chromium/*
 CONSOLE: streams/resources/test-utils.js
@@ -714,24 +715,20 @@ WEB-PLATFORM.TEST:web-bundle/subresource-loading/subresource-loading-from-web-bu
 # Tests that depend on resources in /gen/ in Chromium:
 # https://github.com/web-platform-tests/wpt/issues/16455
 # Please consult with ecosystem-infra@chromium.org before adding more.
-MISSING DEPENDENCY: resources/test-only-api.js
+MISSING DEPENDENCY: bluetooth/resources/bluetooth-test.js
 MISSING DEPENDENCY: contacts/resources/helpers.js
 MISSING DEPENDENCY: credential-management/support/otpcredential-helper.js
 MISSING DEPENDENCY: generic-sensor/resources/generic-sensor-helpers.js
-MISSING DEPENDENCY: idle-detection/interceptor.https.html
+MISSING DEPENDENCY: idle-detection/resources/idle-detection-helper.js
+MISSING DEPENDENCY: mediacapture-image/resources/imagecapture-helpers.js
 MISSING DEPENDENCY: orientation-event/resources/orientation-event-helpers.js
+MISSING DEPENDENCY: resources/test-only-api.js
 MISSING DEPENDENCY: screen_enumeration/resources/screenenumeration-helpers.js
 MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
 MISSING DEPENDENCY: web-nfc/resources/nfc-helpers.js
 MISSING DEPENDENCY: webusb/resources/usb-helpers.js
 MISSING DEPENDENCY: webxr/resources/webxr_util.js
 
-# TODO(Hexcles): delete these files once we include them in mojojs.zip.
-MOJOM-JS: resources/chromium/image_capture.mojom.js
-MOJOM-JS: resources/chromium/sensor_provider.mojom.js
-MOJOM-JS: resources/chromium/mojo_web_test_helper_test.mojom.js
-MOJOM-JS: resources/chromium/sensor.mojom.js
-
 # Tests that are false positives for using Ahem as a system font
 AHEM SYSTEM FONT: acid/acid3/test.html
 AHEM SYSTEM FONT: resource-timing/resources/all_resource_types.htm
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-003.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-003.html
index 4df55b99369..84afe23455a 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-003.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/mpadded/mpadded-003.html
@@ -53,18 +53,34 @@
           assert_approx_equals(shifts.voffset, 0, epsilon);
 
           shifts = GetShifts(mpaddeds[2]);
+          assert_approx_equals(shifts.lspace, 0, epsilon, "positive lspace percentage");
+          assert_approx_equals(shifts.voffset, 0, epsilon);
+
+          shifts = GetShifts(mpaddeds[3]);
+          assert_approx_equals(shifts.lspace, 0, epsilon, "negative lspace percentage");
+          assert_approx_equals(shifts.voffset, 0, epsilon);
+
+          shifts = GetShifts(mpaddeds[4]);
           assert_approx_equals(shifts.lspace, 0, epsilon);
           assert_approx_equals(shifts.voffset, 10, epsilon, "positive voffset");
 
-          shifts = GetShifts(mpaddeds[3]);
+          shifts = GetShifts(mpaddeds[5]);
           assert_approx_equals(shifts.lspace, 0, epsilon);
           assert_approx_equals(shifts.voffset, -10, epsilon, "negative voffset");
 
-          shifts = GetShifts(mpaddeds[4]);
+          shifts = GetShifts(mpaddeds[6]);
+          assert_approx_equals(shifts.lspace, 0, epsilon);
+          assert_approx_equals(shifts.voffset, 0, epsilon, "positive voffset percentage");
+
+          shifts = GetShifts(mpaddeds[7]);
+          assert_approx_equals(shifts.lspace, 0, epsilon);
+          assert_approx_equals(shifts.voffset, 0, epsilon, "negative voffset percentage");
+
+          shifts = GetShifts(mpaddeds[8]);
           assert_approx_equals(shifts.lspace, 5, epsilon);
           assert_approx_equals(shifts.voffset, 10, epsilon);
 
-          shifts = GetShifts(mpaddeds[5]);
+          shifts = GetShifts(mpaddeds[9]);
           assert_approx_equals(shifts.lspace, 5, epsilon);
           assert_approx_equals(shifts.voffset, -10, epsilon);
       }, "content is shifted by the specified lspace/voffset");
@@ -148,8 +164,12 @@ div.shrink-wrap {
     <math>
       <mpadded lspace="5px"  style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
       <mpadded lspace="-5px" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
+      <mpadded lspace="5%"  style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
+      <mpadded lspace="-5%"  style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
       <mpadded voffset="10px" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
       <mpadded voffset="-10px" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
+      <mpadded voffset="10%" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
+      <mpadded voffset="-10%" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
       <mpadded lspace="5px" voffset="10px" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
       <mpadded lspace="5px" voffset="-10px" style="background: black"><mspace width="10px" depth="15px" height="20px" style="background: green; opacity: .5"/></mpadded>
     </math>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html
new file mode 100644
index 00000000000..3938db19a70
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace-ref.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>lspace/rspace default value for unknown operators (reference)</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+      math {
+          font: 100px/1 Ahem;
+      }
+      mo {
+          color: blue;
+      }
+    </style>
+  </head>
+  <body>
+    <p>This test passes if on each row, the space around the blue rectangle
+      is 0.2777777777777778em.</p>
+    <p>
+      <math>
+        <mrow>
+          <mn>p</mn>
+          <mo lspace="0.2777777777777778em" rspace="0.2777777777777778em">X</mo> <!-- Single character -->
+          <mn>p</mn>
+        </mrow>
+      </math>
+    </p>
+    <p>
+      <math>
+        <mrow>
+          <mn>p</mn>
+          <mo lspace="0.2777777777777778em" rspace="0.2777777777777778em">XX</mo> <!-- Multiple characters -->
+          <mn>p</mn>
+        </mrow>
+      </math>
+    </p>
+    <p>
+      <math>
+        <mrow>
+          <mn>p</mn>
+          <mo form="infix" lspace="0.2777777777777778em" rspace="0.2777777777777778em">X</mo> <!-- Explicit form -->
+          <mn>p</mn>
+        </mrow>
+      </math>
+    </p>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html
new file mode 100644
index 00000000000..3437450dfb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-lspace-rspace.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>lspace/rspace default value for unknown operators</title>
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#operator-fence-separator-or-accent-mo">
+    <meta name="assert" content="Verifies that the default lspace/rspace are 0.2777777777777778em for entries that are not in the operator dictionary.">
+    <link rel="match" href="mo-not-in-dictionary-lspace-rspace-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+      math {
+          font: 100px/1 Ahem;
+      }
+      mo {
+          color: blue;
+      }
+    </style>
+  </head>
+  <body>
+    <p>This test passes if on each row, the space around the blue rectangle
+      is 0.2777777777777778em.</p>
+    <p>
+      <math>
+        <mrow>
+          <mn>p</mn>
+          <mo>X</mo> <!-- Single character -->
+          <mn>p</mn>
+        </mrow>
+      </math>
+    </p>
+    <p>
+      <math>
+        <mrow>
+          <mn>p</mn>
+          <mo>XX</mo> <!-- Multiple characters -->
+          <mn>p</mn>
+        </mrow>
+      </math>
+    </p>
+    <p>
+      <math>
+        <mrow>
+          <mn>p</mn>
+          <mo form="infix">X</mo> <!-- Explicit form -->
+          <mn>p</mn>
+        </mrow>
+      </math>
+    </p>
+    <script src="/mathml/support/feature-detection.js"></script>
+    <script>MathMLFeatureDetection.ensure_for_match_reftest("has_operator_spacing");</script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html
new file mode 100644
index 00000000000..e7ffc789947
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits-ref.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>movablelimits default value for unknown operators (reference)</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+      math {
+          font: 50px/1 Ahem;
+      }
+      mo {
+          color: blue;
+      }
+    </style>
+  </head>
+  <body>
+    <p>This test passes if the black scripts are attached above and below
+       the corresponding blue base.</p>
+    <p>
+      <math>
+        <munderover>
+          <mo movablelimits="false">X</mo> <!-- Single character -->
+          <mn>X</mn>
+          <mn>X</mn>
+        </munderover>
+      </math>
+    </p>
+    <p>
+      <math>
+        <munderover>
+          <mo movablelimits="false">XX</mo> <!-- Multiple characters -->
+          <mn>X</mn>
+          <mn>X</mn>
+        </munderover>
+      </math>
+    </p>
+    <p>
+      <math>
+        <munderover>
+          <mo movablelimits="false" form="infix">X</mo> <!-- Explicit form -->
+          <mn>X</mn>
+          <mn>X</mn>
+        </munderover>
+      </math>
+    </p>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html
new file mode 100644
index 00000000000..e50f118f8fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-not-in-dictionary-movablelimits.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>movablelimits default value for unknown operators</title>
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#operator-fence-separator-or-accent-mo">
+    <meta name="assert" content="Verifies that the default movablelimits is false for entries that are not in the operator dictionary.">
+    <link rel="match" href="mo-not-in-dictionary-movablelimits-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <style>
+      math {
+          font: 50px/1 Ahem;
+      }
+      mo {
+          color: blue;
+      }
+    </style>
+  </head>
+  <body>
+    <p>This test passes if the black scripts are attached above and below
+       the corresponding blue base.</p>
+    <p>
+      <math>
+        <munderover>
+          <mo>X</mo> <!-- Single character -->
+          <mn>X</mn>
+          <mn>X</mn>
+        </munderover>
+      </math>
+    </p>
+    <p>
+      <math>
+        <munderover>
+          <mo>XX</mo> <!-- Multiple characters -->
+          <mn>X</mn>
+          <mn>X</mn>
+        </munderover>
+      </math>
+    </p>
+    <p>
+      <math>
+        <munderover>
+          <mo form="infix">X</mo> <!-- Explicit form -->
+          <mn>X</mn>
+          <mn>X</mn>
+        </munderover>
+      </math>
+    </p>
+    <script src="/mathml/support/feature-detection.js"></script>
+    <script>MathMLFeatureDetection.ensure_for_match_reftest("has_movablelimits");</script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
index a09e2cbca32..80ca630a080 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
@@ -43,6 +43,35 @@
   setup({ explicit_done: true });
   window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
+  function getBooleanValue(element, name) {
+      return (element.getAttribute(name) || "").toLowerCase() === "true";
+  }
+  let dynamicBooleanAttributeChanges = {
+      "Invert boolean value using absent attribute": function(element, name) {
+          if (getBooleanValue(element, name)) {
+              element.removeAttribute(name);
+          } else {
+              element.setAttribute(name, "true");
+          }
+      },
+
+      "Invert boolean value using invalid attribute": function(element, name) {
+          if (getBooleanValue(element, name)) {
+              element.setAttribute(name, "invalid");
+          } else {
+              element.setAttribute(name, "true");
+          }
+      },
+
+      "Change case of boolean attribute": function(element, name) {
+          if (getBooleanValue(element, name)) {
+              element.setAttribute(name, "TrUe");
+          } else {
+              element.setAttribute(name, "FaLsE");
+          }
+      }
+  };
+
   function runTests() {
     test(function() {
       assert_true(MathMLFeatureDetection.has_mspace());
@@ -192,6 +221,46 @@
       }
     }, "AccentBaseHeight, OverbarVerticalGap");
 
+    test(function() {
+      assert_true(MathMLFeatureDetection.has_mspace());
+      var v = 7000 * emToPx;
+
+      for (var j = 1; j <= 4; j++) {
+        var elId = `el005${j}`;
+        var baseId = `base005${j}`;
+        var underId = `under005${j}`;
+
+        for (name in dynamicBooleanAttributeChanges) {
+            let element = document.getElementById(elId);
+            dynamicBooleanAttributeChanges[name](element, "accentunder");
+            var value =  getBooleanValue(element, "accentunder");
+            var gap = value ? 0 : v;
+            assert_approx_equals(getBox(underId).top - getBox(baseId).bottom,
+                                 gap, epsilon,
+                                 `${elId}: gap between base and underscript ; ${name}`);
+        };
+      }
+    }, "Dynamic change of accentunder attribute");
+
+    test(function() {
+      assert_true(MathMLFeatureDetection.has_mspace());
+      v = 11000 * emToPx;
+      for (var j = 1; j <= 4; j++) {
+        var elId = `el006${j}`;
+        var refId = `base006${j}`;
+        var overId = `over006${j}`;
+        for (name in dynamicBooleanAttributeChanges) {
+            let element = document.getElementById(elId);
+            dynamicBooleanAttributeChanges[name](element, "accent");
+            var value =  getBooleanValue(element, "accent");
+            assert_approx_equals(getBox(refId).bottom - getBox(overId).bottom,
+                                 value ? axisBaseHeight : shortBaseHeight + v,
+                                 epsilon,
+                                 `${elId}: accent=${value} ; short base ; ${name}`);
+        }
+      }
+    }, "Dynamic change of accent attribute");
+
     done();
   }
 </script>
@@ -329,5 +398,54 @@
         </munderover>
       </math>
     </p>
+    <hr/>
+    <p>
+      <math style="font-family: accentbaseheight4000underbarverticalgap7000;">
+        <mspace id="ref005" height="1em" width="3em" style="background: green"/>
+        <munder style="background: cyan" id="el0051">
+          <mspace id="base0051" height="5em" width="1em" style="background: black"/>
+          <mspace id="under0051" height="1em" width="3em" style="background: blue"/>
+        </munder>
+        <munder style="background: cyan" id="el0052" accentunder="true">
+          <mspace id="base0052" height="5em" width="1em" style="background: black"/>
+          <mspace id="under0052" height="1em" width="3em" style="background: blue"/>
+        </munder>
+        <munderover style="background: cyan" id="el0053">
+          <mspace id="base0053" height="5em" width="1em" style="background: black"/>
+          <mspace id="under0053" height="1em" width="3em" style="background: blue"/>
+          <mspace id="over0053" height="1em" width="3em" style="background: red"/>
+        </munderover>
+        <munderover style="background: cyan" id="el0054" accentunder="true">
+          <mspace id="base0054" height="5em" width="1em" style="background: black"/>
+          <mspace id="under0054" height="1em" width="3em" style="background: blue"/>
+          <mspace id="over0054" height="1em" width="3em" style="background: red"/>
+        </munderover>
+      </math>
+    </p>
+    <hr/>
+    <p>
+      <math style="font-family: accentbaseheight4000overbarverticalgap11000;">
+        <mspace id="ref006" height="1em" width="3em" style="background: green"/>
+        <mover style="background: cyan" id="el0061">
+          <mspace id="base0061" height="3em" width="1em" style="background: black"/>
+          <mspace id="over0061" height="1em" width="3em" style="background: red"/>
+        </mover>
+        <mover style="background: cyan" id="el0062" accent="true">
+          <mspace id="base0062" height="3em" width="1em" style="background: black"/>
+          <mspace id="over0062" height="1em" width="3em" style="background: red"/>
+        </mover>
+        <munderover style="background: cyan" id="el0063">
+          <mspace id="base0063" height="3em" width="1em" style="background: black"/>
+          <mspace id="under0063" height="1em" width="3em" style="background: blue"/>
+          <mspace id="over0063" height="1em" width="3em" style="background: red"/>
+        </munderover>
+        <munderover style="background: cyan" id="el0064" accent="true">
+          <mspace id="base0064" height="3em" width="1em" style="background: black"/>
+          <mspace id="under0064" height="1em" width="3em" style="background: blue"/>
+          <mspace id="over0064" height="1em" width="3em" style="background: red"/>
+        </munderover>
+      </math>
+    </p>
+
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html
similarity index 99%
rename from tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
rename to tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html
index 8df0f4d8ef8..f7c968dd343 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.tentative.html
@@ -4,7 +4,8 @@
 <meta charset="utf-8">
 <title>Underscripts and Overscripts parameters</title>
 <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#underscripts-and-overscripts-munder-mover-munderover">
-<meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table.">
+<link rel="help" href="https://www.w3.org/TR/MathML3/chapter3.html#presm.mo.attrs">
+<meta name="assert" content="Elements munder, mover, munderover correctly use underbar/overbar and AccentBaseHeight parameters from the MATH table ; interaction with MathML3 mo@accent.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/multi-column-layout.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/multi-column-layout.html
new file mode 100644
index 00000000000..d914fe780f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/multi-column-layout.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>MathML inside multi-column</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#html-and-svg">
+<meta name="assert" content="Verify that putting MathML inside a multi-column list shouldn't affect its layout.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+<script>
+  setup({ explicit_done: true });
+  window.addEventListener("DOMContentLoaded", function() {
+      var epsilon = 1;
+      var mfrac = document.getElementById("mfrac");
+      var num = mfrac.firstElementChild.getBoundingClientRect();
+      var denom = mfrac.lastElementChild.getBoundingClientRect();
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_approx_equals(num.width, 30, epsilon, "numerator width");
+          assert_approx_equals(num.height, 40, epsilon, "numerator height");
+          assert_approx_equals(denom.width, 50, epsilon, "numerator width");
+          assert_approx_equals(denom.height, 60, epsilon, "numerator height");
+      }, "mspace layout in multicol");
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mfrac());
+          assert_greater_than_equal(denom.bottom - num.top,
+                                    (40 + 60),
+                                    "numerator is above the denominator");
+          assert_approx_equals((num.left + num.right) / 2,
+                               (denom.left + denom.right) / 2,
+                               epsilon, "numerator and denominator are horizontally aligned");
+      }, "mfrac layout in multicol");
+      done();
+  });
+</script>
+</head>
+<body>
+  <div id="log"></div>
+  <div style="column-width: 10em; list-style-type: decimal;">
+    <ol>
+      <li>blah</li>
+      <li>
+        <math>
+          <mfrac id="mfrac">
+            <mspace width="30px" height="40px" style="background: cyan"></mspace>
+            <mspace width="50px" height="60px" style="background: yellow"></mspace>
+          </mfrac>
+      </li>
+      <li>blah</li>
+      <li>blah</li>
+      <li>blah</li>
+    </ol>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/content-editable.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/content-editable.html
new file mode 100644
index 00000000000..be107453eb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/content-editable.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>MathML inside content-editable</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#html-and-svg">
+<meta name="assert" content="Verify that putting MathML inside a content-editable div shouldn't affect its layout.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+<script>
+  setup({ explicit_done: true });
+  window.addEventListener("DOMContentLoaded", function() {
+      var epsilon = 1;
+      var mfrac = document.getElementById("mfrac");
+      var num = mfrac.firstElementChild.getBoundingClientRect();
+      var denom = mfrac.lastElementChild.getBoundingClientRect();
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_approx_equals(num.width, 30, epsilon, "numerator width");
+          assert_approx_equals(num.height, 40, epsilon, "numerator height");
+          assert_approx_equals(denom.width, 50, epsilon, "denominator width");
+          assert_approx_equals(denom.height, 60, epsilon, "denominator height");
+      }, "mspace layout in content-editable div");
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mfrac());
+          assert_greater_than_equal(denom.bottom - num.top,
+                                    (40 + 60),
+                                    "numerator is above the denominator");
+          assert_approx_equals((num.left + num.right) / 2,
+                               (denom.left + denom.right) / 2,
+                               epsilon, "numerator and denominator are horizontally aligned");
+      }, "mfrac layout in content-editable div");
+      done();
+  });
+</script>
+</head>
+<body>
+  <div id="log"></div>
+  <div contenteditable="true">
+    This is
+    <math>
+      <mfrac id="mfrac">
+        <mspace width="30px" height="40px" style="background: cyan"></mspace>
+        <mspace width="50px" height="60px" style="background: yellow"></mspace>
+      </mfrac>
+    </math>
+    a content editable div
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-5.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-5.html
new file mode 100644
index 00000000000..dc10b46b948
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/integration-point-5.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>MathML sibling of SVG with foreignObject[overflow=visible]</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#html-and-svg">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=989920">
+<meta name="assert" content="Verify that an SVG containing a foreignObject with visible overflow does not affect layout of MathML siblings.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+<script>
+  setup({ explicit_done: true });
+  window.addEventListener("DOMContentLoaded", function() {
+      var scale = 2;
+      var epsilon = 1;
+      var mfrac = document.getElementById("mfrac");
+      var num = mfrac.firstElementChild.getBoundingClientRect();
+      var denom = mfrac.lastElementChild.getBoundingClientRect();
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_approx_equals(num.width, 30, epsilon, "numerator width");
+          assert_approx_equals(num.height, 40, epsilon, "numerator height");
+          assert_approx_equals(denom.width, 50, epsilon, "denonimator width");
+          assert_approx_equals(denom.height, 60, epsilon, "denonimator height");
+      }, "mspace layout in sibling of SVG foreignObject[overflow=visible]");
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mfrac());
+          assert_greater_than_equal(denom.bottom - num.top,
+                                    (40 + 60),
+                                    "numerator above denominator");
+          assert_approx_equals((num.left + num.right) / 2,
+                               (denom.left + denom.right) / 2,
+                               epsilon, "numerator and denominator are horizontally aligned");
+      }, "mfrac layout in sibling of SVG with foreignObject[overflow=visible]");
+      done();
+  });
+</script>
+</head>
+<body>
+  <div id="log"></div>
+  <math>
+    <mfrac id="mfrac">
+      <mspace width="30px" height="40px" style="background: cyan"></mspace>
+      <mspace width="50px" height="60px" style="background: yellow"></mspace>
+    </mfrac>
+  </math>
+  <svg width="200px" height="200px" style="background: lightblue">
+    <foreignObject width="200px" height="200px"
+                   overflow="visible">
+      <div xmlns="http://www.w3.org/1999/xhtml">
+        This is a foreignObject
+      </div>
+    </foreignObject>
+  </svg>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
index 7bbdee26110..e464c8300e4 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
@@ -8,6 +8,8 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/WebIDLParser.js"></script>
 
+<div style="display: none" id="container"></div>
+
 <script>
   "use strict";
 
@@ -153,5 +155,3 @@
       done();
     });
 </script>
-
-<div style="display: none" id="container"></div>
diff --git a/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js b/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js
index 8252f42a637..8301b1c2b64 100644
--- a/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js
+++ b/tests/wpt/web-platform-tests/mediacapture-image/resources/imagecapture-helpers.js
@@ -9,41 +9,31 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 
-let loadChromiumResources = Promise.resolve().then(() => {
-  if (!('MojoInterfaceInterceptor' in self)) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
-
-  let chain = Promise.resolve();
-  [
-    '/resources/chromium/mojo_bindings.js',
-    '/resources/chromium/image_capture.mojom.js',
-    '/resources/chromium/mock-imagecapture.js',
-  ].forEach(path => {
-    // Use importScripts for workers.
-    if (typeof document === 'undefined') {
-      chain = chain.then(() => importScripts(path));
-      return;
-    }
-    let script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    chain = chain.then(() => new Promise(resolve => {
-      script.onload = () => resolve();
-    }));
-    document.head.appendChild(script);
-  });
-
-  return chain;
-});
+async function loadChromiumResources() {
+  const chromiumResources = [
+    '/gen/media/capture/mojom/image_capture.mojom.js'
+  ];
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/chromium/mock-imagecapture.js');
+}
 
 async function initialize_image_capture_tests() {
   if (typeof ImageCaptureTest === 'undefined') {
-    await loadChromiumResources;
+    const script = document.createElement('script');
+    script.src = '/resources/test-only-api.js';
+    script.async = false;
+    const p = new Promise((resolve, reject) => {
+      script.onload = () => { resolve(); };
+      script.onerror = e => { reject(e); };
+    })
+    document.head.appendChild(script);
+    await p;
+
+    if (isChromiumBased) {
+      await loadChromiumResources();
+    }
   }
-  assert_true(typeof ImageCaptureTest !== 'undefined');
+  assert_implements(ImageCaptureTest, 'ImageCaptureTest is unavailable');
   let imageCaptureTest = new ImageCaptureTest();
   await imageCaptureTest.initialize();
   return imageCaptureTest;
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
index d94b43c9cf9..8d8dd7b71bd 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
@@ -73,8 +73,7 @@
         : {video: device_id_constraint};
 
       const stream = await navigator.mediaDevices.getUserMedia(constraints);
-      assert_equals(stream.getTracks()[0].getSettings().groupId,
-                    device.groupId);
+      assert_true(stream.getTracks()[0].getSettings().groupId === device.groupId, "device groupId");
       assert_greater_than(device.groupId.length, 0);
     }
   }, 'groupId is correctly reported by getSettings() for all input devices');
diff --git a/tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js b/tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js
index a9090baeee5..9e7b52261ce 100644
--- a/tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js
+++ b/tests/wpt/web-platform-tests/native-file-system/idlharness.https.any.js
@@ -6,7 +6,7 @@
 
 idl_test(
   ['native-file-system'],
-  ['streams', 'html', 'dom'],
+  ['storage', 'permissions', 'streams', 'html', 'dom'],
   idl_array => {
     idl_array.add_objects({
       // TODO: Add instances of FileSystemHandle, FileSystemFileHandle,
diff --git a/tests/wpt/web-platform-tests/native-file-system/opaque-origin.https.window.js b/tests/wpt/web-platform-tests/native-file-system/opaque-origin.https.window.js
index a916592406e..8f431a24062 100644
--- a/tests/wpt/web-platform-tests/native-file-system/opaque-origin.https.window.js
+++ b/tests/wpt/web-platform-tests/native-file-system/opaque-origin.https.window.js
@@ -38,7 +38,7 @@ async function verify_does_not_exist_in_data_uri_iframe(
 
 // |kSandboxWindowUrl| sends two messages to this window. The first is the
 // result of showDirectoryPicker(). The second is the result of
-// getOriginPrivateDirectory(). For windows using sandbox='allow-scripts',
+// navigator.storage.getDirectory(). For windows using sandbox='allow-scripts',
 // both results must produce rejected promises.
 async function verify_results_from_sandboxed_child_window(test) {
   const event_watcher = new EventWatcher(test, self, 'message');
@@ -50,7 +50,7 @@ async function verify_results_from_sandboxed_child_window(test) {
 
   const second_message_event = await event_watcher.wait_for('message');
   assert_equals(second_message_event.data,
-    'getOriginPrivateDirectory(): REJECTED: SecurityError');
+    'navigator.storage.getDirectory(): REJECTED: SecurityError');
 }
 
 promise_test(async test => {
@@ -67,7 +67,7 @@ promise_test(
       add_iframe(test, kSandboxWindowUrl, /*sandbox=*/ 'allow-scripts');
       await verify_results_from_sandboxed_child_window(test);
     },
-    'getOriginPrivateDirectory() and ' +
+    'navigator.storage.getDirectory() and ' +
         'showDirectoryPicker() must reject in a sandboxed iframe.');
 
 promise_test(
@@ -82,5 +82,5 @@ promise_test(
 
       await verify_results_from_sandboxed_child_window(test);
     },
-    'getOriginPrivateDirectory() and ' +
+    'navigator.storage.getDirectory() and ' +
         'showDirectoryPicker() must reject in a sandboxed opened window.');
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/message-target.js b/tests/wpt/web-platform-tests/native-file-system/resources/message-target.js
index ab8012dfca5..98c726eea06 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/message-target.js
+++ b/tests/wpt/web-platform-tests/native-file-system/resources/message-target.js
@@ -84,8 +84,7 @@ function add_message_event_handlers(receiver, target, target_origin) {
 
         case 'create-file':
           // Create a new file and then respond to the sender with it.
-          const directory =
-            await self.getOriginPrivateDirectory();
+          const directory = await navigator.storage.getDirectory();
           const file_handle =
             await directory.getFileHandle('temp-file', { create: true });
           message_source.postMessage(
@@ -95,8 +94,7 @@ function add_message_event_handlers(receiver, target, target_origin) {
 
         case 'create-directory':
           // Create a new directory and then respond to the sender with it.
-          const parent_directory =
-            await self.getOriginPrivateDirectory();
+          const parent_directory = await navigator.storage.getDirectory();
           const directory_handle =
             await parent_directory.getDirectoryHandle('temp-directory',
               { create: true });
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/opaque-origin-sandbox.html b/tests/wpt/web-platform-tests/native-file-system/resources/opaque-origin-sandbox.html
index e2d57a33999..63ada267d8c 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/opaque-origin-sandbox.html
+++ b/tests/wpt/web-platform-tests/native-file-system/resources/opaque-origin-sandbox.html
@@ -4,7 +4,7 @@
 
   // Sends two messages to its creator:
   // (1) The result of showDirectoryPicker().
-  // (2) The result of getOriginPrivateDirectory().
+  // (2) The result of navigator.storage.getDirectory().
 
   function post_message(data) {
     if (window.parent !== null) {
@@ -27,13 +27,13 @@
   }
 
   try {
-    window.getOriginPrivateDirectory()
+    navigator.storage.getDirectory()
       .then(() => {
-        post_message('getOriginPrivateDirectory(): FULFILLED');
+        post_message('navigator.storage.getDirectory(): FULFILLED');
       }).catch(error => {
-        post_message(`getOriginPrivateDirectory(): REJECTED: ${error.name}`);
+        post_message(`navigator.storage.getDirectory(): REJECTED: ${error.name}`);
       });
   } catch (error) {
-    post_message(`getOriginPrivateDirectory(): EXCEPTION: ${error.name}`);
+    post_message(`navigator.storage.getDirectory(): EXCEPTION: ${error.name}`);
   }
 </script>
diff --git a/tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js b/tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js
index e3c18dbecec..a7506b6b2f3 100644
--- a/tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js
+++ b/tests/wpt/web-platform-tests/native-file-system/resources/sandboxed-fs-test-helpers.js
@@ -7,8 +7,7 @@
 // where that version uses the native file system instead.
 
 async function cleanupSandboxedFileSystem() {
-  const dir =
-      await self.getOriginPrivateDirectory();
+  const dir = await navigator.storage.getDirectory();
   for await (let entry of dir.values())
     await dir.removeEntry(entry.name, {recursive: entry.kind === 'directory'});
 }
@@ -18,8 +17,7 @@ function directory_test(func, description) {
     // To be extra resilient against bad tests, cleanup before every test.
     await cleanupSandboxedFileSystem();
 
-    const dir =
-        await self.getOriginPrivateDirectory();
+    const dir = await navigator.storage.getDirectory();
     await func(t, dir);
   }, description);
 }
diff --git a/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html b/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
index 2289b8f8d8b..370aa45c578 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/native-file-system/showOpenFilePicker-manual.https.html
@@ -21,8 +21,8 @@
       'show a file picker.<br />Please select native-file-system/resources/data/testfile.txt');
     const files = await self.showOpenFilePicker({
       multiple: false, types: [
-        { description: 'Text files', accept: { ' text/plain ': ['txt'] } },
-        { description: 'Images', accept: { '  image/*  ': ['jpg', 'jpeg', 'png'] } },
+        { description: 'Text files', accept: { ' text/plain ': ['.txt'] } },
+        { description: 'Images', accept: { '  image/*  ': ['.jpg', '.jpeg', '.png'] } },
       ],
     });
     assert_true(Array.isArray(files));
diff --git a/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js b/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
index 1f1d2edd63d..e8f0d3f5404 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
+++ b/tests/wpt/web-platform-tests/native-file-system/showPicker-errors.https.window.js
@@ -27,47 +27,47 @@ function define_file_picker_error_tests(showPickerMethod) {
   promise_test(async t => {
     await promise_rejects_js(
         t, TypeError,
-        self[showPickerMethod]({types: [{accept: {'': ['foo']}}]}));
+        self[showPickerMethod]({types: [{accept: {'': ['.foo']}}]}));
     await promise_rejects_js(
         t, TypeError,
-        self[showPickerMethod]({types: [{accept: {'  ': ['foo']}}]}));
+        self[showPickerMethod]({types: [{accept: {'  ': ['.foo']}}]}));
   }, showPickerMethod + ': MIME type can\'t be an empty string.');
 
   promise_test(async t => {
     await promise_rejects_js(
         t, TypeError,
-        self[showPickerMethod]({types: [{accept: {'image': ['foo']}}]}));
+        self[showPickerMethod]({types: [{accept: {'image': ['.foo']}}]}));
   }, showPickerMethod + ': MIME type must have subtype.');
 
   promise_test(async t => {
     await promise_rejects_js(
         t, TypeError,
-        self[showPickerMethod]({types: [{accept: {'  /plain': ['foo']}}]}));
+        self[showPickerMethod]({types: [{accept: {'  /plain': ['.foo']}}]}));
   }, showPickerMethod + ': MIME type can\'t have empty type.');
 
   promise_test(async t => {
     await promise_rejects_js(
         t, TypeError,
-        self[showPickerMethod]({types: [{accept: {'image/  ': ['foo']}}]}));
+        self[showPickerMethod]({types: [{accept: {'image/  ': ['.foo']}}]}));
   }, showPickerMethod + ': MIME type can\'t have empty subtype.');
 
   promise_test(async t => {
     await promise_rejects_js(
         t, TypeError,
         self[showPickerMethod](
-            {types: [{accept: {'text/plain;charset=utf8': ['txt']}}]}));
+            {types: [{accept: {'text/plain;charset=utf8': ['.txt']}}]}));
   }, showPickerMethod + ': MIME type can\'t have parameters.');
 
   promise_test(async t => {
     await promise_rejects_js(t, TypeError, self[showPickerMethod]({
-                               types: [{accept: {'text>foo/plain': ['txt']}}]
+                               types: [{accept: {'text>foo/plain': ['.txt']}}]
                              }));
   }, showPickerMethod + ': MIME type can\'t have invalid characters in type.');
 
   promise_test(async t => {
     await promise_rejects_js(
         t, TypeError,
-        self[showPickerMethod]({types: [{accept: {'text / plain': ['txt']}}]}));
+        self[showPickerMethod]({types: [{accept: {'text / plain': ['.txt']}}]}));
   }, showPickerMethod + ': MIME type can\'t have whitespace in the middle.');
 
   promise_test(
@@ -75,8 +75,14 @@ function define_file_picker_error_tests(showPickerMethod) {
         await promise_rejects_js(
             t, TypeError,
             self[showPickerMethod](
-                {types: [{accept: {'text/plain>foo': ['txt']}}]}));
+                {types: [{accept: {'text/plain>foo': ['.txt']}}]}));
       },
       showPickerMethod +
           ': MIME type can\'t have invalid characters in subtype.');
-}
\ No newline at end of file
+
+  promise_test(async t => {
+    await promise_rejects_js(t, TypeError, self[showPickerMethod]({
+                               types: [{accept: {'text/plain': ['.txt', 'txt']}}]
+                             }));
+  }, showPickerMethod + ': extension has to start with ".".');
+}
diff --git a/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html b/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
index 451a0fb9c7f..3a20f1428d9 100644
--- a/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
+++ b/tests/wpt/web-platform-tests/native-file-system/showSaveFilePicker-manual.https.html
@@ -14,7 +14,7 @@
       'show a file picker.<br />Please make a copy of native-file-system/resources/data/testfile.txt in a writable directory and pick that file');
     const file = await self.showSaveFilePicker({
       multiple: false, types: [
-        { description: 'Text files', accept: { 'text/plain': ['txt'] } },
+        { description: 'Text files', accept: { 'text/plain': ['.txt'] } },
       ],
     });
     assert_true(file instanceof FileSystemHandle);
diff --git a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
index 0338cda62dd..7545cedaffd 100644
--- a/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_async.tentative.https.any.js
@@ -110,3 +110,18 @@ promise_test(async testCase => {
   await promise_rejects_dom(testCase, 'InvalidStateError', file.flush());
   assert_equals(await closePromise, undefined);
 }, 'NativeIOFile.flush fails immediately after calling NativeIOFile.close');
+
+promise_test(async testCase => {
+  const file = await createFile(testCase, 'file_name');
+  assert_equals(await file.close(), undefined);
+
+  await promise_rejects_dom(testCase, 'InvalidStateError', file.setLength(5));
+}, 'NativeIOFile.setLength fails after NativeIOFile.close settles');
+
+promise_test(async testCase => {
+  const file = await createFile(testCase, 'file_name');
+  const closePromise = file.close();
+
+  await promise_rejects_dom(testCase, 'InvalidStateError', file.setLength(5));
+  assert_equals(await closePromise, undefined);
+}, 'NativeIOFile.setLength fails immediately after calling NativeIOFile.close');
diff --git a/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
index 834265f2255..f2de6d571a4 100644
--- a/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
+++ b/tests/wpt/web-platform-tests/native-io/close_sync.tentative.https.any.js
@@ -56,3 +56,10 @@ test(testCase => {
 
   assert_throws_dom('InvalidStateError', () => file.flush());
 }, 'NativeIOFileSync.flush fails after NativeIOFileSync.close');
+
+test(testCase => {
+  const file = createFileSync(testCase, 'file_name');
+  assert_equals(undefined, file.close());
+
+  assert_throws_dom('InvalidStateError', () => file.setLength(4));
+}, 'NativeIOFileSync.setLength fails after NativeIOFileSync.close');
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
new file mode 100644
index 00000000000..cb7d6642c84
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/concurrent_io_setLength_async.tentative.https.any.js
@@ -0,0 +1,31 @@
+// META: title=NativeIO API: Concurrent io while setLength is resolving.
+// META: global=window,worker
+// META: script=operation_helpers.js
+// META: script=../resources/support.js
+
+'use strict';
+
+// See documentation in operation_helpers.js
+
+for (let op of kOperations) {
+  promise_test(async testCase => {
+    const file = await createFile(testCase, 'setlength_file');
+
+    const res = op.prepare();
+
+    const setLengthPromise = file.setLength(5);
+    op.assertRejection(testCase, file, res);
+
+    await setLengthPromise;
+
+    const readSharedArrayBuffer = new SharedArrayBuffer(5);
+    const readBytes = new Uint8Array(readSharedArrayBuffer);
+    assert_equals(await file.read(readBytes, 0), 5,
+                  `NativeIOFile.read() should not fail after a rejected ` +
+                    `${op.name}() during setLength().`);
+    assert_array_equals(readBytes, [64, 65, 66, 67, 0],
+                        `Rejecting ${op.name}() during setLength()` +
+                          ` should not change the file.`);
+    op.assertUnchanged(res);
+  }, `${op.name}() rejects while setLength() is resolving.`);
+};
diff --git a/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js b/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js
index 76804cab72d..d85a153bab1 100644
--- a/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js
+++ b/tests/wpt/web-platform-tests/native-io/concurrent_io/operation_helpers.js
@@ -39,6 +39,7 @@ const kOperations = [];
     },
   };
   kOperations.push(kOpRead);
+
   const kOpWrite = {
     name: 'write',
     prepare: () => {
@@ -54,6 +55,7 @@ const kOperations = [];
     assertUnchanged: () => {},
   };
   kOperations.push(kOpWrite);
+
   const kOpGetLength = {
     name: 'getLength',
     prepare: () => {},
@@ -75,4 +77,15 @@ const kOperations = [];
     assertUnchanged: () => {},
   };
   kOperations.push(kOpFlush);
+
+  const kOpSetLength = {
+    name: 'setLength',
+    prepare: () => {},
+    assertRejection: async (testCase, file, readBytes) => {
+      return promise_rejects_dom(testCase, 'InvalidStateError',
+                                file.setLength(2));
+    },
+    assertUnchanged: () => {},
+  };
+  kOperations.push(kOpSetLength);
 })();
diff --git a/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
new file mode 100644
index 00000000000..f99d2875fc0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/getLength_setLength_async_basic.tentative.https.any.js
@@ -0,0 +1,53 @@
+// META: title=NativeIO API: Assigned length is observed back.
+// META: global=window,worker
+// META: script=resources/support.js
+
+'use strict';
+
+promise_test(async testCase => {
+  const file = await nativeIO.open('test_file');
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await nativeIO.delete('test_file');
+  });
+
+  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
+  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
+  writtenBytes.set([97, 98, 99, 100]);
+  await file.write(writtenBytes, 0);
+
+  await file.setLength(3);
+  const readBytes = await readIoFile(file);
+
+  const remainingBytes = Uint8Array.from([97, 98, 99]);
+
+  assert_array_equals(
+      readBytes, remainingBytes,
+      'NativeIOFile.setLength() should remove bytes from the end of ' +
+        'a file when decreasing its length');
+}, 'NativeIOFile.setLength shrinks a file, NativeIOFile.getLength reports ' +
+      'new length');
+
+promise_test(async testCase => {
+  const file = await nativeIO.open('test_file');
+  testCase.add_cleanup(async () => {
+    await file.close();
+    await nativeIO.delete('test_file');
+  });
+
+  const writeSharedArrayBuffer = new SharedArrayBuffer(4);
+  const writtenBytes = new Uint8Array(writeSharedArrayBuffer);
+  writtenBytes.set([97, 98, 99, 100]);
+  await file.write(writtenBytes, 0);
+
+  await file.setLength(5);
+  const readBytes = await readIoFile(file);
+
+  const expectedBytes = Uint8Array.from([97, 98, 99, 100, 0]);
+
+  assert_array_equals(
+      readBytes, expectedBytes,
+      'NativeIOFile.setLength() should append zeros when increasing' +
+        ' the file size');
+}, 'NativeIOFile.setLength appends zeros to a file, NativeIOFile.getLength ' +
+      'reports new length');
diff --git a/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
new file mode 100644
index 00000000000..f65cd44510e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/getLength_setLength_sync_basic.tentative.https.any.js
@@ -0,0 +1,48 @@
+// META: title=Synchronous NativeIO API: Assigned length is observed back.
+// META: global=dedicatedworker
+// META: script=resources/support.js
+
+'use strict';
+
+test(testCase => {
+  const file = nativeIO.openSync('test_file');
+  testCase.add_cleanup(() => {
+    file.close();
+    nativeIO.deleteSync('test_file');
+  });
+
+  const writtenBytes = Uint8Array.from([97, 98, 99, 100]);
+  file.write(writtenBytes, 0);
+
+  file.setLength(3);
+  const readBytes = readIoFileSync(file);
+
+  const remainingBytes = Uint8Array.from([97, 98, 99]);
+  assert_array_equals(
+      readBytes, remainingBytes,
+      'NativeIOFileSync.setLength() should remove bytes from the end of ' +
+        'a file when decreasing its length.');
+}, 'NativeIOFileSync.setLength shrinks a file and' +
+     ' NativeIOFileSync.getLength reports its new length.');
+
+test(testCase => {
+  const file = nativeIO.openSync('test_file');
+  testCase.add_cleanup(() => {
+    file.close();
+    nativeIO.deleteSync('test_file');
+  });
+
+  const writtenBytes = Uint8Array.from([97, 98, 99, 100]);
+  file.write(writtenBytes, 0);
+
+  file.setLength(5);
+  const readBytes = readIoFileSync(file);
+
+  const expectedBytes = Uint8Array.from([97, 98, 99, 100, 0]);
+
+  assert_array_equals(
+      readBytes, expectedBytes,
+      'NativeIOFileSync.setLength() should append zeros when increasing' +
+        ' the file size.');
+}, 'NativeIOFileSync.setLength appends zeros to a file and ' +
+     'NativeIOFileSync.getLength reports its new length.');
diff --git a/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js
new file mode 100644
index 00000000000..b00370c47f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/setLength_bounds_async.tentative.https.any.js
@@ -0,0 +1,20 @@
+// META: title=NativeIO API: Out-of-bounds errors for setLength.
+// META: global=window,worker
+// META: script=resources/support.js
+
+'use strict';
+
+promise_test(async testCase => {
+  const file = await createFile(testCase, "file_length_zero");
+  await file.setLength(0);
+  const lengthDecreased = await file.getLength();
+  assert_equals(lengthDecreased, 0,
+                "NativeIOFile.setLength() should set the file length to 0.");
+}, 'NativeIOFile.setLength does not throw an error when descreasing the ' +
+     'file length to 0.');
+
+promise_test(async testCase => {
+  const file = await createFile(testCase, "file_length_negative");
+  await promise_rejects_js(testCase, TypeError,
+                           file.setLength(-1));
+}, 'NativeIOFile.setLength() throws when setting negative lengths.');
diff --git a/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js b/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js
new file mode 100644
index 00000000000..d95752fdd8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/setLength_bounds_sync.tentative.https.any.js
@@ -0,0 +1,24 @@
+// META: title=Synchronous NativeIO API: Out-of-bounds errors for setLength.
+// META: global=dedicatedworker
+// META: script=resources/support.js
+
+'use strict';
+
+test(testCase => {
+  const file = createFileSync(testCase, "file_length_zero");
+  file.setLength(0);
+  const lengthDecreased = file.getLength();
+  assert_equals(lengthDecreased, 0,
+                "NativeIOFileSync.setLength() should set the file length to 0.");
+}, 'NativeIOFileSync.setLength() does not throw an error when descreasing ' +
+     'the file length to 0.');
+
+test(testCase => {
+  const file = createFileSync(testCase, "file_length_negative");
+
+  // Without this assertion, the test passes even if setLength is not defined.
+  assert_implements(file.setLength,
+                    "NativeIOFileSync.setLength is not implemented.");
+
+  assert_throws_js(TypeError, () => file.setLength(-1));
+}, 'NativeIOFileSync.setLength() throws when setting negative lengths.');
diff --git a/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js b/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js
new file mode 100644
index 00000000000..ae01ac42015
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-io/trustworthy_origin_failure.tentative.http.any.js
@@ -0,0 +1,9 @@
+// META: title=NativeIO API: Interface is not exposed in untrustworthy origin.
+// META: global=window,dedicatedworker
+
+'use strict';
+
+test(testCase => {
+  var present = (typeof nativeIO !== 'undefined');
+  assert_false(present);
+}, 'NativeIO should not be accessible from an untrustworthy origin');
diff --git a/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js b/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js
index 530a9058faa..72cf0c3a3d3 100644
--- a/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/navigation-timing/idlharness.window.js
@@ -6,24 +6,15 @@
 
 // http://www.w3.org/TR/navigation-timing/
 
-promise_test(async (t) => {
-  const srcs = ['navigation-timing', 'hr-time', 'resource-timing', 'performance-timeline', 'dom', 'html'];
-  const [navigationTiming, hrTime, resourceTiming, performanceTimeline, dom, html] =
-      await Promise.all(srcs.map(i => fetch(`/interfaces/${i}.idl`).then(r => r.text())));
-  const idlArray = new IdlArray();
-  idlArray.add_idls(hrTime);
-  idlArray.add_idls(navigationTiming);
-  idlArray.add_dependency_idls(resourceTiming);
-  idlArray.add_dependency_idls(performanceTimeline);
-  idlArray.add_dependency_idls(dom);
-  idlArray.add_dependency_idls(html);
-  idlArray.add_objects({
-    Performance: ['performance'],
-    PerformanceNavigation: ['performance.navigation'],
-    PerformanceTiming: ['performance.timing'],
-    PerformanceNavigationTiming: [
-      'performance.getEntriesByType("navigation")[0]'
-    ]
-  });
-  return idlArray.test();
-})
+idl_test(
+  ['navigation-timing', 'hr-time'],
+  ['resource-timing', 'performance-timeline', 'dom', 'html'],
+  idlArray => {
+    idlArray.add_objects({
+      Performance: ['performance'],
+      PerformanceNavigation: ['performance.navigation'],
+      PerformanceTiming: ['performance.timing'],
+      PerformanceNavigationTiming: ['performance.getEntriesByType("navigation")[0]']
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/navigation-timing/nav2_test_navigate_iframe.html b/tests/wpt/web-platform-tests/navigation-timing/nav2_test_navigate_iframe.html
index 0490610e017..0c144bda454 100644
--- a/tests/wpt/web-platform-tests/navigation-timing/nav2_test_navigate_iframe.html
+++ b/tests/wpt/web-platform-tests/navigation-timing/nav2_test_navigate_iframe.html
@@ -8,7 +8,7 @@
   </head>
   <body>
     <script>
-async_test(async function (t) {
+promise_test(async function (t) {
   var ifr = document.createElement("iframe");
   document.body.appendChild(ifr);
 
@@ -34,8 +34,6 @@ async_test(async function (t) {
       resolve();
     }
   });
-
-  t.done();
 }, "navigation.name updated when iframe URL changes");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/navigation-timing/test_document_onload.html b/tests/wpt/web-platform-tests/navigation-timing/test_document_onload.html
index fd385554499..7cc18491d62 100644
--- a/tests/wpt/web-platform-tests/navigation-timing/test_document_onload.html
+++ b/tests/wpt/web-platform-tests/navigation-timing/test_document_onload.html
@@ -17,7 +17,7 @@
         <div id="log"></div>
 
         <script>
-            async_test(async function (t) {
+            async_test(function (t) {
                 document.addEventListener("DOMContentLoaded", t.step_func_done(() => {
                     let entry = window.performance.getEntriesByType("navigation")[0];
                     assert_greater_than(entry.transferSize, 1000, "descr");
@@ -26,13 +26,13 @@
                 }));
             }, "Test that the attributes have a proper value during DOMContentLoaded");
 
-            async_test(async function (t) {
+            async_test(function (t) {
                 window.addEventListener("load", t.step_func_done(() => {
                     let entry = window.performance.getEntriesByType("navigation")[0];
                     assert_greater_than(entry.transferSize, 1000, "descr");
                     assert_greater_than(entry.encodedBodySize, 1000, "descr");
                     assert_greater_than(entry.decodedBodySize, 1000, "descr");
-                    async_test(async function (t) {
+                    async_test(function (t) {
                         setTimeout(t.step_func_done(() => {
                           let entry = window.performance.getEntriesByType("navigation")[0];
                           assert_greater_than(entry.transferSize, 1000, "descr");
diff --git a/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js b/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js
index 3f81fec5867..51154ad7376 100644
--- a/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js
+++ b/tests/wpt/web-platform-tests/orientation-event/resources/orientation-event-helpers.js
@@ -8,42 +8,33 @@
 // these tests the browser must be run with these options:
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
-const loadChromiumResources = async () => {
-  if (!('MojoInterfaceInterceptor' in self)) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
-
-  const resources = [
-    '/gen/layout_test_data/mojo/public/js/mojo_bindings.js',
+async function loadChromiumResources() {
+  const chromiumResources = [
     '/gen/mojo/public/mojom/base/string16.mojom.js',
     '/gen/services/device/public/mojom/sensor.mojom.js',
     '/gen/services/device/public/mojom/sensor_provider.mojom.js',
-    '/resources/chromium/generic_sensor_mocks.js',
   ];
-
-  await Promise.all(resources.map(path => {
-    const script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    const promise = new Promise((resolve, reject) => {
-      script.onload = resolve;
-      script.onerror = reject;
-    });
-    document.head.appendChild(script);
-    return promise;
-  }));
-};
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/chromium/generic_sensor_mocks.js');
+}
 
 async function initialize_generic_sensor_tests() {
   if (typeof GenericSensorTest === 'undefined') {
-    await loadChromiumResources();
+    const script = document.createElement('script');
+    script.src = '/resources/test-only-api.js';
+    script.async = false;
+    const p = new Promise((resolve, reject) => {
+      script.onload = () => { resolve(); };
+      script.onerror = e => { reject(e); };
+    })
+    document.head.appendChild(script);
+    await p;
+
+    if (isChromiumBased) {
+      await loadChromiumResources();
+    }
   }
-  assert_true(
-    typeof GenericSensorTest !== 'undefined',
-    'Mojo testing interface is not available.'
-  );
+  assert_implements(GenericSensorTest, 'GenericSensorTest is unavailable.');
   let sensorTest = new GenericSensorTest();
   await sensorTest.initialize();
   return sensorTest;
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html
index 8c18711093c..27085aa151e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-bad-subdomain.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frameIndex = 0;
@@ -21,7 +21,7 @@ for (const badValue of ["", "?0", "true", "\"?1\"", "1", "?2", "(?1)"]) {
 
   // Since the header values are bad there should be no isolation
   testSameAgentCluster([self, frameIndex], `"${badValue}"`);
-  testOriginIsolationRestricted(frameIndex, false, `"${badValue}"`);
+  testGetter(frameIndex, false, `"${badValue}"`);
   ++frameIndex;
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html
index 10df411a96f..d1466e55c04 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-port.sub.https.html
@@ -9,7 +9,8 @@
 <script type="module">
 import {
   insertIframe,
-  testDifferentAgentClusters
+  testDifferentAgentClusters,
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -19,6 +20,8 @@ promise_setup(async () => {
 // Since they're different-origin, the child's isolation request is respected,
 // so the parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
-
 testDifferentAgentClusters([self, 0]);
+
+testGetter(self, false, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html
index 034c8a3090b..39d6cf996a8 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-same.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -20,6 +20,7 @@ promise_setup(async () => {
 // Since they're same-origin, and the parent loaded without isolation, the
 // child's request for isolation gets ignored, and both end up site-keyed.
 testSameAgentCluster([self, 0]);
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, false, "child");
+
+testGetter(self, false, "parent");
+testGetter(0, false, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html
index 3894f560f04..648c641553c 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yes-subdomain.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -21,6 +21,7 @@ promise_setup(async () => {
 // so the parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
 testDifferentAgentClusters([self, 0]);
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, true, "child");
+
+testGetter(self, false, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
index a47729bb032..400a8f72332 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -21,6 +21,7 @@ promise_setup(async () => {
 // so the parent ends up in the site-keyed agent cluster and the child in the
 // origin-keyed one.
 testDifferentAgentClusters([self, 0]);
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, true, "child");
+
+testGetter(self, false, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html
index 09389e338ab..793c47328e1 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-port.sub.https.html
@@ -9,7 +9,8 @@
 <script type="module">
 import {
   insertIframe,
-  testDifferentAgentClusters
+  testDifferentAgentClusters,
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -20,4 +21,7 @@ promise_setup(async () => {
 // as is the child's non-request. So the parent ends up in the origin-keyed
 // agent cluster and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0]);
+
+testGetter(self, true, "parent");
+testGetter(0, false, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html
index 7070c1b891d..f1ca9a9a7cd 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-same.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -21,6 +21,6 @@ promise_setup(async () => {
 // child's non-request for isolation gets ignored, and both end up origin-keyed.
 testSameAgentCluster([self, 0]);
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child");
+testGetter(self, true, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html
index 32e5a1768d8..be84ecac2d1 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-no-subdomain.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -22,6 +22,6 @@ promise_setup(async () => {
 // agent cluster and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0]);
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, false, "child");
+testGetter(self, true, "parent");
+testGetter(0, false, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html
index 96669c30d14..58516b86742 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-port.sub.https.html
@@ -9,7 +9,8 @@
 <script type="module">
 import {
   insertIframe,
-  testDifferentAgentClusters
+  testDifferentAgentClusters,
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -20,4 +21,7 @@ promise_setup(async () => {
 // cluster (the default port's origin), and the child ends up in a different
 // origin-keyed agent cluster (the other port's origin).
 testDifferentAgentClusters([self, 0]);
+
+testGetter(self, true, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html
index a83582f747a..b08206b4478 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-same.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -21,6 +21,6 @@ promise_setup(async () => {
 // same origin-keyed agent cluster.
 testSameAgentCluster([self, 0]);
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child");
+testGetter(self, true, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
index 7010e4c5f4f..9a426d068ae 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/1-iframe/parent-yes-child-yes-subdomain.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -22,6 +22,6 @@ promise_setup(async () => {
 // origin-keyed agent cluster (the www subdomain's origin).
 testDifferentAgentClusters([self, 0]);
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child");
+testGetter(self, true, "parent");
+testGetter(0, true, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
index a8437c5966f..55c15838127 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -30,7 +30,7 @@ testSameAgentCluster([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, false, "child1");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, false, "parent");
+testGetter(0, false, "child1");
+testGetter(1, false, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
index 4103373df6c..2c0bb614b50 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
@@ -11,6 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -29,4 +30,8 @@ testSameAgentCluster([self, 0], "Parent to child1");
 testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
+
+testGetter(self, false, "parent");
+testGetter(0, false, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
index 06d58b3a9c4..e31af2061fb 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-no-subdomain1-child2-yes-subdomain2.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -21,7 +21,6 @@ promise_setup(async () => {
   await insertIframe("{{hosts[][www1]}}", "?1");
 });
 
-
 // Since everybody is different-origin, everyone's requests/non-requests get
 // respected.
 //
@@ -32,7 +31,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, false, "child1");
-testOriginIsolationRestricted(1, true, "child2");
+testGetter(self, false, "parent");
+testGetter(0, false, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
index 68c9fe1aa6d..eaccc8509cd 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-port.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -31,7 +31,7 @@ testSameAgentCluster([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, true, "child1");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, false, "parent");
+testGetter(0, true, "child1");
+testGetter(1, false, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
index 4e95827ce68..5adb911ae8b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-no-child1-yes-subdomain-child2-no-subdomain.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, true, "child1");
-testOriginIsolationRestricted(1, true, "child2");
+testGetter(self, false, "parent");
+testGetter(0, true, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
index f261b8eea2c..e463f328f19 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, false, "child1");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, true, "parent");
+testGetter(0, false, "child1");
+testGetter(1, false, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
index 86c951dd826..2d67979b68a 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-no-subdomain2.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, false, "child1");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, true, "parent");
+testGetter(0, false, "child1");
+testGetter(1, false, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
index 997fa0859f1..ecf759cde06 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, false, "child1");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, true, "parent");
+testGetter(0, false, "child1");
+testGetter(1, false, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
index 7631bdd1bd4..0448076178a 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, false, "child1");
-testOriginIsolationRestricted(1, true, "child2");
+testGetter(self, true, "parent");
+testGetter(0, false, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
index e578e350208..1b14ca48ba7 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html
@@ -10,6 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -30,4 +31,8 @@ testDifferentAgentClusters([self, 0], "Parent to child1");
 testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
+
+testGetter(self, true, "parent");
+testGetter(0, false, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
index edcdcbabd76..fcdb1369971 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-port.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -30,7 +30,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child1");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, true, "parent");
+testGetter(0, true, "child1");
+testGetter(1, false, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
index f8503312460..011bcd1637b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child1");
-testOriginIsolationRestricted(1, true, "child2");
+testGetter(self, true, "parent");
+testGetter(0, true, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
index 6ae6fac7718..1a4dd4c9a65 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -33,7 +33,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testSameAgentCluster([0, 1], "child1 to child2");
 testSameAgentCluster([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child1");
-testOriginIsolationRestricted(1, true, "child2");
+testGetter(self, true, "parent");
+testGetter(0, true, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
index 53eaea13ca2..852fd2d216e 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -32,7 +32,7 @@ testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "child1");
-testOriginIsolationRestricted(1, true, "child2");
+testGetter(self, true, "parent");
+testGetter(0, true, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
index 370f3dc773f..ba8edadc188 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html
@@ -10,6 +10,7 @@
 import {
   insertIframe,
   testDifferentAgentClusters,
+  testGetter
 } from "../resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -30,4 +31,8 @@ testDifferentAgentClusters([self, 0], "Parent to child1");
 testDifferentAgentClusters([self, 1], "Parent to child2");
 testDifferentAgentClusters([0, 1], "child1 to child2");
 testDifferentAgentClusters([1, 0], "child2 to child1");
+
+testGetter(self, true, "parent");
+testGetter(0, true, "child1");
+testGetter(1, true, "child2");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/README.md b/tests/wpt/web-platform-tests/origin-isolation/README.md
index 8ff8de614fd..693ab4048c0 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/README.md
+++ b/tests/wpt/web-platform-tests/origin-isolation/README.md
@@ -24,3 +24,8 @@ Other directories have variations on this, e.g. `1-iframe/` does the same thing
 but for a single `child` instead of `child1` and `child2`, and `navigation/`
 uses `1` and `2` to represent the two different locations the single iframe will
 be navigated to.
+
+## Coverage
+
+Header parsing is covered by a few tests in the `1-iframe/` subdirectory, and
+not duplicated to all other scenarios.
diff --git a/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html b/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html
index 6af31dd021f..edc98b363e4 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/about-blank.https.sub.html
@@ -12,7 +12,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "./resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -26,9 +26,9 @@ testSameAgentCluster([self, 0], "parent to about:blank");
 testDifferentAgentClusters([0, 1], "about:blank to child2");
 testDifferentAgentClusters([1, 0], "child2 to about:blank");
 
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, true, "about:blank");
-testOriginIsolationRestricted(1, false, "child2");
+testGetter(self, true, "parent");
+testGetter(0, true, "about:blank");
+testGetter(1, false, "child2");
 
 async function insertAboutBlankIframe() {
   const iframe = document.createElement("iframe");
@@ -37,7 +37,7 @@ async function insertAboutBlankIframe() {
   // Now create and add the script, but don't navigate anywhere (since we want
   // to stay on the initial about:blank).
   // We need to absolutize the URL to since about:blank doesn't have a base URL.
-  const scriptURL = (new URL("./resources/child-frame-script.mjs", import.meta.url)).href;
+  const scriptURL = (new URL("./resources/send-header-page-script.mjs", import.meta.url)).href;
   const script = iframe.contentDocument.createElement("script");
   script.type = "module";
   script.src = scriptURL;
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html
new file mode 100644
index 00000000000..16ecb451929
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a top-level frame sandboxed by CSP with no Origin-Isolation header</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import { testGetter } from "../resources/helpers.mjs";
+
+// Even without the header, sandboxing makes this page have an opaque origin,
+// so it is origin-isolated.
+testGetter(self, true);
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers
new file mode 100644
index 00000000000..4705ce9dede
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts;
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html
new file mode 100644
index 00000000000..b9a7359974d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a top-level frame sandboxed by CSP with an Origin-Isolation header</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import { testGetter } from "../resources/helpers.mjs";
+
+// We're definitely origin-isolated: both the CSP sandboxing and the
+// Origin-Isolation header should ensure this.
+testGetter(self, true);
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
new file mode 100644
index 00000000000..3fd1539d4ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers
@@ -0,0 +1,2 @@
+Content-Security-Policy: sandbox allow-scripts;
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html
new file mode 100644
index 00000000000..cb00ef782d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a javascript: URL navigated to from a data: URL on a non-isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/data-to-javascript-test.mjs";
+runTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html
new file mode 100644
index 00000000000..6856441deff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a javascript: URL navigated to from a data: URL on an isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/data-to-javascript-test.mjs";
+runTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url.https.html.headers
rename to tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html
new file mode 100644
index 00000000000..5b194eaef35
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a data: URL on a non-isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/data-url-test.mjs";
+runTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html
new file mode 100644
index 00000000000..85821be32b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolationRestricted for a data: URL on an isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/data-url-test.mjs";
+runTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe.sub.https.html.headers
rename to tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url.https.html
deleted file mode 100644
index 6933f35930d..00000000000
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url.https.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>window.originIsolationRestricted for a data: URL</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<!-- TODO(domenic): update this to test window.originIsolated, not
-     window.originIsolationRestricted. See
-     https://github.com/WICG/origin-isolation/pull/34. -->
-
-<div id="log"></div>
-
-<script type="module">
-import {
-  waitForIframe,
-  testOriginIsolationRestricted
-} from "../resources/helpers.mjs";
-
-promise_setup(() => {
-  const iframe = document.createElement("iframe");
-
-  // This copies parts of resources/send-origin-isolation-header.py that allow
-  // us to reuse testOriginIsolationRestricted.
-  iframe.src = `data:text/html,<script>
-    window.onmessage = () => {
-      parent.postMessage(self.originIsolationRestricted, "*");
-    };
-    </` + `script>
-  `;
-
-  const waitPromise = waitForIframe(iframe);
-  document.body.append(iframe);
-  return waitPromise;
-});
-
-// The data: URL iframe has an opaque origin, so it should return true, since
-// for them site === origin so they are always "origin-isolated".
-
-testOriginIsolationRestricted(0, true);
-</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html
new file mode 100644
index 00000000000..b75cae47cdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a javascript: URL on a non-isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/data-url-test.mjs";
+runTest({ expected: false });
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html
new file mode 100644
index 00000000000..573b1a0b712
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a javascript: URL on an isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/data-url-test.mjs";
+runTest({ expected: true });
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
index fd838cdbb55..d7ad4903ab9 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html
@@ -1,13 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>window.originIsolationRestricted for a removed frame</title>
+<title>window.originIsolated for a removed frame</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<!-- TODO(domenic): update this to test window.originIsolated, not
-     window.originIsolationRestricted. See
-     https://github.com/WICG/origin-isolation/pull/34. -->
-
 <div id="log"></div>
 
 <script type="module">
@@ -24,8 +20,8 @@ promise_test(async () => {
 
   const frameWindow = iframe.contentWindow;
 
-  assert_equals(frameWindow.originIsolationRestricted, true, "before");
+  assert_equals(frameWindow.originIsolated, true, "before");
   iframe.remove();
-  assert_equals(frameWindow.originIsolationRestricted, true, "after");
-}, "Removing the iframe does not change originIsolationRestricted");
+  assert_equals(frameWindow.originIsolated, true, "after");
+}, "Removing the iframe does not change originIsolated");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs
new file mode 100644
index 00000000000..3a88253ee30
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs
@@ -0,0 +1,33 @@
+import { insertCustomIframe, testSupportScript } from "./helpers.mjs";
+import { waitForIframe, testGetter } from "../../resources/helpers.mjs";
+
+const testSupportScriptSuitableForNesting =
+  testSupportScript.replace('</script>', '</scri` + `pt>');
+
+export default () => {
+  promise_setup(async () => {
+    const jsURL = `javascript:'${testSupportScript}'`;
+    const iframe = await insertCustomIframe(`data:text/html,
+      Start page
+      <script>
+        window.onmessage = () => {
+          location.href = \`javascript:'End page${testSupportScriptSuitableForNesting}'\`;
+        };
+      </script>
+    `);
+
+    const waitPromise = waitForIframe(iframe, "javascript: URL");
+
+    // Kick off the navigation. We can't do it directly because only same-origin
+    // pages can navigate to a javascript: URL, and we're not same-origin with
+    // a data: URL.
+    iframe.contentWindow.postMessage(undefined, "*");
+
+    await waitPromise;
+  });
+
+  // The javascript: URL iframe inherits its origin from the previous occupant
+  // of the iframe, which is a data: URL, so it should always be true.
+
+  testGetter(0, true);
+};
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs
new file mode 100644
index 00000000000..d32d8521be4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs
@@ -0,0 +1,13 @@
+import { insertCustomIframe, testSupportScript } from "./helpers.mjs";
+import { testGetter } from "../../resources/helpers.mjs";
+
+export default () => {
+  promise_setup(() => {
+    return insertCustomIframe(`data:text/html,${testSupportScript}`);
+  });
+
+  // The data: URL iframe has an opaque origin, so it should return true, since
+  // for them site === origin so they are always "origin-isolated".
+
+  testGetter(0, true, "data: URL child");
+};
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
new file mode 100644
index 00000000000..d1e3cc17a13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs
@@ -0,0 +1,29 @@
+import { waitForIframe } from "../../resources/helpers.mjs";
+
+/**
+ * Inserts an iframe, not specialized for origin-isolation testing, pointing to
+ * a custom URL. This is just a wrapper to remove some boilerplate.
+ * @param {string} src - The src="" value for the iframe
+ */
+export async function insertCustomIframe(src) {
+  const iframe = document.createElement("iframe");
+  iframe.src = src;
+
+  const waitPromise = waitForIframe(iframe);
+  document.body.append(iframe);
+  await waitPromise;
+
+  return iframe;
+}
+
+/**
+ * This is the part of send-origin-isolation-header.py that allows
+ * us to reuse testGetter.
+ */
+export const testSupportScript = `
+  <script>
+  window.onmessage = () => {
+    parent.postMessage(self.originIsolated, "*");
+  };
+  </script>
+`;
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/javascript-url-test.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/javascript-url-test.mjs
new file mode 100644
index 00000000000..de474d8cafc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/javascript-url-test.mjs
@@ -0,0 +1,14 @@
+import { insertCustomIframe, testSupportScript } from "./helpers.mjs";
+import { testGetter } from "../../resources/helpers.mjs";
+
+export default ({ expected }) => {
+  promise_setup(() => {
+    return insertCustomIframe(`javascript:'${testSupportScript}'`);
+  });
+
+  // The javascript: URL iframe inherits its origin from the previous occupant
+  // of the iframe, which is about:blank, which in turn inherits from the
+  // parent. So, the caller needs to tell us what to expect.
+
+  testGetter(0, expected);
+};
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
new file mode 100644
index 00000000000..98575b8d80e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-iframe-test.sub.mjs
@@ -0,0 +1,20 @@
+import {
+  navigateIframe,
+  testGetter
+} from "../../resources/helpers.mjs";
+
+export default () => {
+  // We do this manually instead of using insertIframe because we want to add a
+  // sandbox="" attribute and we don't want to set both document.domains.
+  promise_setup(() => {
+    const iframe = document.createElement("iframe");
+    iframe.sandbox = "allow-scripts";
+    const navigatePromise = navigateIframe(iframe, "{{hosts[][]}}", "?1");
+    document.body.append(iframe);
+    return navigatePromise;
+  });
+
+  // Sandboxed iframes have an opaque origin, so it should return true, since
+  // for them site === origin so they are always "origin-isolated".
+  testGetter(0, true);
+};
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs
new file mode 100644
index 00000000000..272f805870c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/sandboxed-same-origin-iframe-test.sub.mjs
@@ -0,0 +1,20 @@
+import {
+  navigateIframe,
+  testGetter
+} from "../../resources/helpers.mjs";
+
+export default ({ expected }) => {
+  // We do this manually instead of using insertIframe because we want to add a
+  // sandbox="" attribute and we don't want to set both document.domains.
+  promise_setup(() => {
+    const iframe = document.createElement("iframe");
+    iframe.sandbox = "allow-scripts allow-same-origin";
+    const navigatePromise = navigateIframe(iframe, "{{hosts[][]}}", "?1");
+    document.body.append(iframe);
+    return navigatePromise;
+  });
+
+  // Since the allow-same-origin token is set, this should behave like a normal
+  // iframe, and follow the embedder.
+  testGetter(0, expected);
+};
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html
new file mode 100644
index 00000000000..bc2276fede8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-no.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a sandboxed iframe on a non-isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/sandboxed-iframe-test.sub.mjs";
+runTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html
new file mode 100644
index 00000000000..5805d3421eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a sandboxed iframe on an isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/sandboxed-iframe-test.sub.mjs";
+runTest();
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe.sub.https.html
deleted file mode 100644
index fb91d467764..00000000000
--- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe.sub.https.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>window.originIsolationRestricted for a sandboxed frame</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<!-- TODO(domenic): update this to test window.originIsolated, not
-     window.originIsolationRestricted. See
-     https://github.com/WICG/origin-isolation/pull/34. -->
-
-<div id="log"></div>
-
-<script type="module">
-import {
-  navigateIframe,
-  testOriginIsolationRestricted
-} from "../resources/helpers.mjs";
-
-// We do this manually instead of using insertIframe because we want to add a
-// sandbox="" attribute and we don't want to set both document.domains.
-promise_setup(() => {
-  const iframe = document.createElement("iframe");
-  iframe.sandbox = "allow-scripts";
-  const navigatePromise = navigateIframe(iframe, "{{hosts[][]}}", "?1");
-  document.body.append(iframe);
-  return navigatePromise;
-});
-
-// Sandboxed iframes have an opaque origin, so it should return true, since
-// for them site === origin so they are always "origin-isolated".
-testOriginIsolationRestricted(0, true);
-</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
new file mode 100644
index 00000000000..a1b44a1e5b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a sandboxed, but same-origin, iframe on a non-isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/sandboxed-same-origin-iframe-test.sub.mjs";
+runTest({ expected: false });
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
new file mode 100644
index 00000000000..b9339afae2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>window.originIsolated for a sandboxed, but same-origin, iframe on an isolated page</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import runTest from "./resources/sandboxed-same-origin-iframe-test.sub.mjs";
+runTest({ expected: true });
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
index ff9ea4dca8c..85ee2f677f3 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html
@@ -13,7 +13,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -24,8 +24,8 @@ promise_setup(async () => {
 // Nobody requested isolation yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, false, "before parent");
-testOriginIsolationRestricted(0, false, "before child");
+testGetter(self, false, "before parent");
+testGetter(0, false, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][]}}:{{ports[https][1]}}", "?1");
@@ -35,6 +35,6 @@ promise_test(async () => {
 // Since the new page is different-origin, it should be isolated.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, false, "after parent");
-testOriginIsolationRestricted(0, true, "after child");
+testGetter(self, false, "after parent");
+testGetter(0, true, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
index f599cb986d9..bb39de648ac 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html
@@ -13,7 +13,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -24,8 +24,8 @@ promise_setup(async () => {
 // Nobody requested isolation yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, false, "before parent");
-testOriginIsolationRestricted(0, false, "before child");
+testGetter(self, false, "before parent");
+testGetter(0, false, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][www]}}", "?1");
@@ -35,6 +35,6 @@ promise_test(async () => {
 // Since the new page is different-origin, it should be isolated.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, false, "after parent");
-testOriginIsolationRestricted(0, true, "after child");
+testGetter(self, false, "after parent");
+testGetter(0, true, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
index 8777b656e33..b52ca783f6f 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html
@@ -12,7 +12,7 @@ import {
   navigateIframe,
   setBothDocumentDomains,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -23,8 +23,8 @@ promise_setup(async () => {
 // Nobody requested isolation yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, false, "before parent");
-testOriginIsolationRestricted(0, false, "before child");
+testGetter(self, false, "before parent");
+testGetter(0, false, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][www]}}", "?1");
@@ -35,6 +35,6 @@ promise_test(async () => {
 // isolation request is ignored; instead we continue isolating.
 
 testSameAgentCluster([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, false, "after parent");
-testOriginIsolationRestricted(0, false, "after child");
+testGetter(self, false, "after parent");
+testGetter(0, false, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
index 22f35eb9149..67e99cee090 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html
@@ -13,7 +13,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -24,8 +24,8 @@ promise_setup(async () => {
 // Nobody requested isolation yet.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, false, "before parent");
-testOriginIsolationRestricted(0, false, "before child");
+testGetter(self, false, "before parent");
+testGetter(0, false, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][www1]}}", "?1");
@@ -36,6 +36,6 @@ promise_test(async () => {
 // isolation request is respected.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, false, "after parent");
-testOriginIsolationRestricted(0, true, "after child");
+testGetter(self, false, "after parent");
+testGetter(0, true, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
index ac51e6ef80c..1b7dd01947f 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html
@@ -13,7 +13,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -24,8 +24,8 @@ promise_setup(async () => {
 // Since they are different-origin, the child's isolation request is respected.
 
 testDifferentAgentClusters([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, false, "before parent");
-testOriginIsolationRestricted(0, true, "before child");
+testGetter(self, false, "before parent");
+testGetter(0, true, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][www1]}}");
@@ -36,6 +36,6 @@ promise_test(async () => {
 // doesn't somehow get isolated just because its predecessor was.
 
 testSameAgentCluster([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, false, "after parent");
-testOriginIsolationRestricted(0, false, "after child");
+testGetter(self, false, "after parent");
+testGetter(0, false, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
index 425983423ba..783f5870a83 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html
@@ -12,7 +12,7 @@ import {
   navigateIframe,
   setBothDocumentDomains,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -23,8 +23,8 @@ promise_setup(async () => {
 // Since they are different-origin, the child's isolation request is respected.
 
 testDifferentAgentClusters([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, false, "before parent");
-testOriginIsolationRestricted(0, true, "before child");
+testGetter(self, false, "before parent");
+testGetter(0, true, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][www]}}");
@@ -35,6 +35,6 @@ promise_test(async () => {
 // non-isolation request is ignored; instead we continue isolating.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, false, "after parent");
-testOriginIsolationRestricted(0, true, "after child");
+testGetter(self, false, "after parent");
+testGetter(0, true, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
index 2d9c9ac98d0..461fd0ddc4b 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html
@@ -13,7 +13,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -25,8 +25,8 @@ promise_setup(async () => {
 // so it gets isolated too.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, true, "before parent");
-testOriginIsolationRestricted(0, true, "before child");
+testGetter(self, true, "before parent");
+testGetter(0, true, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][]}}:{{ports[https][1]}}");
@@ -36,6 +36,6 @@ promise_test(async () => {
 // Since the new page is different-origin, its non-request should be respected.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, true, "after parent");
-testOriginIsolationRestricted(0, false, "after child");
+testGetter(self, true, "after parent");
+testGetter(0, false, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
index abf0da2b5d6..6832cd03858 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html
@@ -13,7 +13,7 @@ import {
   setBothDocumentDomains,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "../resources/helpers.mjs";
 
 let frame1;
@@ -25,8 +25,8 @@ promise_setup(async () => {
 // so it gets isolated too.
 
 testSameAgentCluster([self, 0], "Before: parent to child");
-testOriginIsolationRestricted(self, true, "before parent");
-testOriginIsolationRestricted(0, true, "before child");
+testGetter(self, true, "before parent");
+testGetter(0, true, "before child");
 
 promise_test(async () => {
   await navigateIframe(frame1, "{{hosts[][www]}}");
@@ -36,6 +36,6 @@ promise_test(async () => {
 // Since the new page is different-origin, its non-request should be respected.
 
 testDifferentAgentClusters([self, 0], "After: parent to child");
-testOriginIsolationRestricted(self, true, "after parent");
-testOriginIsolationRestricted(0, false, "after child");
+testGetter(self, true, "after parent");
+testGetter(0, false, "after child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html b/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html
index 583ca2f441b..18e0216e262 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html
@@ -10,7 +10,7 @@
 import {
   insertIframe,
   testSameAgentCluster,
-  testOriginIsolationRestricted
+  testGetter
 } from "./resources/helpers.mjs";
 
 promise_setup(async () => {
@@ -21,6 +21,6 @@ promise_setup(async () => {
 // So both end up in the site-keyed agent cluster.
 testSameAgentCluster([self, 0]);
 
-testOriginIsolationRestricted(self, false, "parent");
-testOriginIsolationRestricted(0, false, "child");
+testGetter(self, false, "parent");
+testGetter(0, false, "child");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html
new file mode 100644
index 00000000000..270162530b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is not isolated, openee is isolated, openee is different-origin to the opener because of a port mismatch</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInADifferentAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}", "?1");
+});
+
+// Since they're different-origin, the openee's isolation request is respected,
+// so the opener ends up in the site-keyed agent cluster and the openee in the
+// origin-keyed one.
+testOpenedWindowIsInADifferentAgentCluster(() => openee);
+
+testGetter(self, false, "opener");
+testGetter(() => openee, true, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html
new file mode 100644
index 00000000000..0c8d89b8e66
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is not isolated, openee is isolated, openee is same-origin to the opener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInSameAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][]}}", "?1");
+});
+
+// Since they're same-origin, and the opener loaded without isolation, the
+// child's request for isolation gets ignored, and both end up site-keyed.
+testOpenedWindowIsInSameAgentCluster(() => openee);
+
+testGetter(self, false, "opener");
+testGetter(() => openee, false, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html
new file mode 100644
index 00000000000..d1aaabd9206
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is not isolated, openee is isolated, openee is a subdomain of the opener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInADifferentAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][www]}}", "?1");
+});
+
+// Since they're different-origin, the openee's isolation request is respected,
+// so the opener ends up in the site-keyed agent cluster and the openee in the
+// origin-keyed one.
+testOpenedWindowIsInADifferentAgentCluster(() => openee);
+
+testGetter(self, false, "opener");
+testGetter(() => openee, true, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html
new file mode 100644
index 00000000000..96b839e167f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is isolated, openee is not isolated, openee is different-origin to the opener because of a port mismatch</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInADifferentAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}");
+});
+
+// Since they're different-origin, the openee's isolation non-request is
+// respected, so the opener ends up in the origin-keyed agent cluster and the
+// openee in the site-keyed one.
+testOpenedWindowIsInADifferentAgentCluster(() => openee);
+
+testGetter(self, true, "opener");
+testGetter(() => openee, false, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html
new file mode 100644
index 00000000000..0dee5fae002
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is isolated, openee is not isolated, openee is same-origin to the opener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInSameAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][]}}");
+});
+
+// Since they're same-origin, the openee's isolation non-request is ignored,
+// so both end up in the origin-keyed agent cluster.
+testOpenedWindowIsInSameAgentCluster(() => openee);
+
+testGetter(self, true, "opener");
+testGetter(() => openee, true, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html
new file mode 100644
index 00000000000..cfec0fda130
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is isolated, openee is not isolated, openee is a subdomain of the opener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInADifferentAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][www]}}");
+});
+
+// Since they're different-origin, the openee's isolation non-request is
+// respected, so the opener ends up in the origin-keyed agent cluster and the
+// openee in the site-keyed one.
+testOpenedWindowIsInADifferentAgentCluster(() => openee);
+
+testGetter(self, true, "opener");
+testGetter(() => openee, false, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html
new file mode 100644
index 00000000000..4ea37421df0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is isolated, openee is isolated, openee is different-origin to the opener because of a port mismatch</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInADifferentAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}", "?1");
+});
+
+// Both request isolation, so the opener ends up in one origin-keyed agent
+// cluster (the default port's origin), and the openee ends up in a different
+// origin-keyed agent cluster (the other port's origin).
+testOpenedWindowIsInADifferentAgentCluster(() => openee);
+
+testGetter(self, true, "opener");
+testGetter(() => openee, true, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html
new file mode 100644
index 00000000000..603f11d8de6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is isolated, openee is isolated, openee is same-origin to the opener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInSameAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][]}}", "?1");
+});
+
+// Both request isolation, and they're same-origin, so they both end up in the
+// same origin-keyed agent cluster.
+testOpenedWindowIsInSameAgentCluster(() => openee);
+
+testGetter(self, true, "opener");
+testGetter(() => openee, true, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html
new file mode 100644
index 00000000000..b182d496a92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener is isolated, openee is isolated, openee is a subdomain of the opener</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id="log"></div>
+
+<script type="module">
+import {
+  openWindow,
+  testOpenedWindowIsInADifferentAgentCluster,
+  testGetter
+} from "../resources/helpers.mjs";
+
+let openee;
+promise_setup(async () => {
+  openee = await openWindow("{{hosts[][www]}}", "?1");
+});
+
+// Both request isolation, so the opener ends up in one origin-keyed agent
+// cluster (the base domain's origin), and the openee ends up in a different
+// origin-keyed agent cluster (the www subdomain's origin).
+testOpenedWindowIsInADifferentAgentCluster(() => openee);
+
+testGetter(self, true, "opener");
+testGetter(() => openee, true, "openee");
+</script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
new file mode 100644
index 00000000000..ea3f6b335c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers
@@ -0,0 +1 @@
+Origin-Isolation: ?1
diff --git a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html b/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html
index 3a6d91c447a..cbe13af8207 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html
+++ b/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html
@@ -11,7 +11,7 @@ import {
   insertIframe,
   testSameAgentCluster,
   testDifferentAgentClusters,
-  testOriginIsolationRestricted
+  testGetter
 } from "./resources/helpers.mjs";
 
 let frame1;
@@ -23,8 +23,8 @@ promise_setup(async () => {
 // as is the child's non-request. So the parent ends up in the origin-keyed
 // agent cluster and the child ends up in the site-keyed one.
 testDifferentAgentClusters([self, 0], "Before");
-testOriginIsolationRestricted(self, true, "parent");
-testOriginIsolationRestricted(0, false, "child1");
+testGetter(self, true, "parent");
+testGetter(0, false, "child1");
 
 promise_test(async () => {
   frame1.remove();
@@ -41,6 +41,6 @@ testDifferentAgentClusters([self, 1], "Parent to child3");
 testSameAgentCluster([0, 1], "child2 to child3");
 testSameAgentCluster([1, 0], "child3 to child2");
 
-testOriginIsolationRestricted(0, false, "child2");
-testOriginIsolationRestricted(1, false, "child3");
+testGetter(0, false, "child2");
+testGetter(1, false, "child3");
 </script>
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs b/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
index 73f9406b476..8bd1c8e9250 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs
@@ -28,7 +28,7 @@ export async function insertIframe(host, header) {
  *   if the error event fires
  */
 export function navigateIframe(iframeEl, host, header) {
-  const url = getIframeURL(host, header);
+  const url = getSendHeaderURL(host, header);
 
   const waitPromise = waitForIframe(iframeEl, url);
   iframeEl.src = url;
@@ -54,6 +54,32 @@ export function waitForIframe(iframeEl, destinationForErrorMessage) {
   });
 }
 
+/**
+ * Opens a new window usable for origin isolation testing, and returns a promise
+ * fulfilled when the window is loaded and its document.domain is set. The
+ * window will point to the send-origin-isolation-header.py file, on the
+ * designated host.
+ *
+ * The opened window will be automatically closed when all the tests complete.
+ * @param {string} host - The host used to calculate the window's URL
+ * @param {string=} header - The value of the Origin-Isolation header that the
+ *   iframe will set. Omit this to set no header.
+ * @returns {WindowProxy} The created window
+ */
+export async function openWindow(host, header) {
+  const url = getSendHeaderURL(host, header, { sendLoadedMessage: true });
+  const openedWindow = window.open(url);
+
+  add_completion_callback(() => openedWindow.close());
+
+  const whatHappened = await waitForMessage(openedWindow);
+  assert_equals(whatHappened, "loaded");
+
+  await setBothDocumentDomains(openedWindow);
+
+  return openedWindow;
+}
+
 /**
  * Expands into a pair of promise_test() calls to ensure that two Windows are in
  * the same agent cluster, by checking both that we can send a
@@ -177,29 +203,79 @@ export function testDifferentAgentClusters(testFrames, testLabelPrefix) {
 }
 
 /**
- * Creates a promise_test() to check the value of the originIsolationRestricted
- * getter in the given testFrame.
- * @param {Window|number} testFrame - Either self, or a frame index to test.
- * @param {boolean} expected - The expected value for originIsolationRestricted.
+ * Expands into a pair of promise_test() calls to ensure that the given window,
+ * opened by window.open(), is in a different agent cluster from the current
+ * (opener) window.
+ * @param {function} openedWindowGetter - A function that returns the opened
+ * window
+ */
+export function testOpenedWindowIsInADifferentAgentCluster(openedWindowGetter) {
+  promise_test(async () => {
+    const whatHappened = await sendWasmModule(openedWindowGetter());
+
+    assert_equals(whatHappened, "messageerror");
+  }, `messageerror event must occur`);
+
+  promise_test(async () => {
+    assert_throws_dom("SecurityError", DOMException, () => {
+      openedWindowGetter().document;
+    });
+
+    assert_throws_dom("SecurityError", DOMException, () => {
+      openedWindowGetter().location.href;
+    });
+  }, `setting document.domain must not give sync access`);
+}
+
+/**
+ * Expands into a pair of promise_test() calls to ensure that the given window,
+ * opened by window.open(), is in the same agent cluster as the current
+ * (opener) window.
+ * @param {function} openedWindowGetter - A function that returns the opened
+ * window
+ */
+export function testOpenedWindowIsInSameAgentCluster(openedWindowGetter) {
+  promise_test(async () => {
+    const whatHappened = await sendWasmModule(openedWindowGetter());
+
+    assert_equals(whatHappened, "WebAssembly.Module message received");
+  }, `message event must occur`);
+
+  promise_test(async () => {
+    // Must not throw
+    openedWindowGetter().document;
+
+    // Must not throw
+    openedWindowGetter().location.href;
+  }, `setting document.domain must give sync access`);
+}
+
+/**
+ * Creates a promise_test() to check the value of the originIsolated getter in
+ * the given testFrame.
+ * @param {Window|number|function} testFrame - Either self, or a frame index to
+     test, or a function that returns a windwo to test.
+ * @param {boolean} expected - The expected value for originIsolated.
  * @param {string=} testLabelPrefix - A prefix used in the test names. This can
  *   be omitted if the function is only used once in a test file.
  */
-export function testOriginIsolationRestricted(testFrame, expected, testLabelPrefix) {
+export function testGetter(testFrame, expected, testLabelPrefix) {
   const prefix = testLabelPrefix === undefined ? "" : `${testLabelPrefix}: `;
 
-  if (testFrame === self) {
-    // Need to use promise_test() even though it's sync because we use
-    // promise_setup() in many tests.
-    promise_test(async () => {
-      assert_equals(self.originIsolationRestricted, expected);
-    }, `${prefix}originIsolationRestricted must equal ${expected}`);
-  } else {
-    promise_test(async () => {
+  promise_test(async () => {
+    if (testFrame === self) {
+      assert_equals(self.originIsolated, expected);
+    } else if (typeof testFrame === "number") {
       const frameWindow = frames[testFrame];
-      const result = await getOriginIsolationRestricted(frameWindow);
+      const result = await accessOriginIsolated(frameWindow);
       assert_equals(result, expected);
-    }, `${prefix}originIsolationRestricted must equal ${expected}`);
-  }
+    } else {
+      assert_equals(typeof testFrame, "function",
+        "testFrame argument must be self, a number, or a function");
+      const result = await accessOriginIsolated(testFrame());
+      assert_equals(result, expected);
+    }
+  }, `${prefix}originIsolated must equal ${expected}`);
 }
 
 /**
@@ -241,19 +317,22 @@ export async function setBothDocumentDomains(frameWindow) {
   assert_equals(whatHappened, "document.domain is set");
 }
 
-async function getOriginIsolationRestricted(frameWindow) {
+async function accessOriginIsolated(frameWindow) {
   // This function is coupled to ./send-origin-isolation-header.py, which ensures
   // that sending such a message will result in a message back.
-  frameWindow.postMessage({ command: "get originIsolationRestricted" }, "*");
+  frameWindow.postMessage({ command: "get originIsolated" }, "*");
   return waitForMessage(frameWindow);
 }
 
-function getIframeURL(host, header) {
+function getSendHeaderURL(host, header, { sendLoadedMessage = false } = {}) {
   const url = new URL("send-origin-isolation-header.py", import.meta.url);
   url.host = host;
   if (header !== undefined) {
     url.searchParams.set("header", header);
   }
+  if (sendLoadedMessage) {
+    url.searchParams.set("send-loaded-message", "");
+  }
 
   return url.href;
 }
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/child-frame-script.mjs b/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
similarity index 76%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/child-frame-script.mjs
rename to tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
index 783e36092da..fe3dc6a8e09 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/child-frame-script.mjs
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs
@@ -1,16 +1,28 @@
 import { sendWasmModule } from "./helpers.mjs";
 
+// This is done for the window.open() case. For <iframe>s we use the
+// <iframe> element's load event instead.
+const usp = new URLSearchParams(location.search);
+if (usp.has("send-loaded-message")) {
+  opener.postMessage("loaded", "*");
+}
+
 window.onmessage = async (e) => {
-  // These could come from the parent or siblings.
+  // These could come from the parent, opener, or siblings.
   if (e.data.constructor === WebAssembly.Module) {
     e.source.postMessage("WebAssembly.Module message received", "*");
   }
 
-  // These only come from the parent.
+  // These could come from the parent or opener.
   if (e.data.command === "set document.domain") {
     document.domain = e.data.newDocumentDomain;
-    parent.postMessage("document.domain is set", "*");
-  } else if (e.data.command === "send WASM module") {
+    e.source.postMessage("document.domain is set", "*");
+  } else if (e.data.command === "get originIsolated") {
+    e.source.postMessage(self.originIsolated, "*");
+  }
+
+  // These only come from the parent.
+  if (e.data.command === "send WASM module") {
     const destinationFrameWindow = parent.frames[e.data.indexIntoParentFrameOfDestination];
     const whatHappened = await sendWasmModule(destinationFrameWindow);
     parent.postMessage(whatHappened, "*");
@@ -38,8 +50,6 @@ window.onmessage = async (e) => {
     } else {
       parent.postMessage("something wierd happened", "*");
     }
-  } else if (e.data.command === "get originIsolationRestricted") {
-    parent.postMessage(self.originIsolationRestricted, "*");
   }
 
   // We could also receive e.data === "WebAssembly.Module message received",
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/child-frame-script.mjs.headers b/tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/origin-isolation/resources/child-frame-script.mjs.headers
rename to tests/wpt/web-platform-tests/origin-isolation/resources/send-header-page-script.mjs.headers
diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py b/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
index 02976a9c056..6a677578976 100644
--- a/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
+++ b/tests/wpt/web-platform-tests/origin-isolation/resources/send-origin-isolation-header.py
@@ -17,5 +17,5 @@ def main(request, response):
     <title>Helper page for origin isolation tests</title>
 
     <body>
-    <script type="module" src="child-frame-script.mjs"></script>
+    <script type="module" src="send-header-page-script.mjs"></script>
     """
diff --git a/tests/wpt/web-platform-tests/paint-timing/child-painting-first-image.html b/tests/wpt/web-platform-tests/paint-timing/child-painting-first-image.html
index 38cf499ccaf..3badae1849f 100644
--- a/tests/wpt/web-platform-tests/paint-timing/child-painting-first-image.html
+++ b/tests/wpt/web-platform-tests/paint-timing/child-painting-first-image.html
@@ -4,19 +4,37 @@
 <script src="/resources/testharnessreport.js"></script>
 
 <script>
+var entriesExpectToReceive = [
+    {
+        'entryType': 'paint',
+        'name': 'first-paint'
+    },
+    {
+        'entryType': 'paint',
+        'name': 'first-contentful-paint'
+    }
+];
+
 setup({"hide_test_state": true});
 async_test(function (t) {
     assert_implements(window.PerformancePaintTiming, "Paint Timing isn't supported.");
     window.addEventListener('message', t.step_func(e => {
-        assert_equals(e.data, '2 paint first-paint paint first-contentful-paint');
         // When only child frame paints, expect only first-paint.
-        t.step_timeout( function() {
+        for (let i = 0; i < entriesExpectToReceive.length; i++) {
+            if (entriesExpectToReceive[i].entryType == e.data.entryType &&
+                entriesExpectToReceive[i].name == e.data.name) {
+                entriesExpectToReceive.splice(i, 1);
+                break;
+            }
+        }
+
+        if (entriesExpectToReceive.length == 0) {
             const bufferedEntries = performance.getEntriesByType('paint');
             assert_equals(bufferedEntries.length, 1);
             assert_equals(bufferedEntries[0].entryType, 'paint');
             assert_equals(bufferedEntries[0].name, 'first-paint');
             t.done();
-        }, 50);
+        }
     }));
     const iframe = document.createElement('iframe');
     iframe.id = 'child-iframe';
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-background-size.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-background-size.html
index 8cc83702c1f..25fe986bded 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-background-size.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-background-size.html
@@ -22,7 +22,17 @@
 <script src="../resources/utils.js"></script>
 <div id="main"></div>
 <script>
-    test_fcp("First contentful paint fires due to background size.");
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires due to background size.", load_image);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-set.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-set.html
index 0cc52d0263e..443cef630bd 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-set.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-set.html
@@ -20,7 +20,17 @@
 <script src="../resources/utils.js"></script>
 <div id="main"></div>
 <script>
-    test_fcp("First contentful paint fires due to background image in image-set.");
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires due to background image in image-set.", load_image);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html
index 4dc9af9da84..89b161f8593 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-bg-image-two-steps.html
@@ -27,7 +27,17 @@
 <script src="../resources/utils.js"></script>
 <div id="main"></div>
 <script>
-    test_fcp("First contentful paint fires for background image only when visible.");
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires for background image only when visible.", load_image);
 </script>
 </body>
 
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-iframe.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-iframe.html
new file mode 100644
index 00000000000..674bcd91214
--- /dev/null
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-iframe.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<head>
+    <title>
+        Performance Paint Timing Test: Not only the top level document, paints
+        in the iframe should also generate the entry
+    </title>
+</head>
+<body>
+<script src="../resources/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({"hide_test_state": true});
+async_test(function (t) {
+    assert_implements(window.PerformancePaintTiming, "Paint Timing isn't supported.");
+    window.addEventListener('message', t.step_func(e => {
+        if (e.data.entryType == "paint" && e.data.name == "first-contentful-paint") {
+            t.done();
+        }
+    }));
+    const iframe = document.createElement('iframe');
+    iframe.src = '../resources/subframe-painting.html';
+    document.body.appendChild(iframe);
+}, 'Parent frame ignores paint-timing events fired from child image rendering.');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale.html
index 5389e8a846b..4d3a060e851 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-invisible-scale.html
@@ -24,7 +24,17 @@
 <script src="../resources/utils.js"></script>
 <div id="main"></div>
 <script>
-    test_fcp("First contentful paint fires due to scale becoming positive.")
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires due to scale becoming positive.", load_image)
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity.html
index 83afdde195b..3c6912c4e6e 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-opacity.html
@@ -24,7 +24,17 @@
 <script src="../resources/utils.js"></script>
 <div id="main"></div>
 <script>
-    test_fcp("First contentful paint fires due to opacity-revealed element.");
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires due to opacity-revealed element.", load_image);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html
index 3553772d4fc..91556e50e0a 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-out-of-bounds.html
@@ -23,7 +23,17 @@
 <script src="../resources/utils.js"></script>
 <div id="main"></div>
 <script>
-    test_fcp("First contentful paint fires due to intersection with document.")
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires due to intersection with document.", load_image)
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-image.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-image.html
index ba38edb68cb..d67ae21cd96 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-image.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-pseudo-element-image.html
@@ -21,7 +21,17 @@
 <div id="main">
 </div>
 <script>
-    test_fcp("First contentful paint fires due to pseudo-element image.")
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("First contentful paint fires due to pseudo-element image.", load_image)
 </script>
 </body>
 
diff --git a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-whitespace.html b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-whitespace.html
index 6e1f425de80..71c72b018a4 100644
--- a/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-whitespace.html
+++ b/tests/wpt/web-platform-tests/paint-timing/fcp-only/fcp-whitespace.html
@@ -29,7 +29,17 @@
     <div id="text">TEXT</div>
 </div>
 <script>
-    test_fcp("Whitespace should not count as contentful.")
+    // Load the image into memory first to make sure it's decoded.
+    function load_image() {
+      const img = document.createElement("img");
+      img.src = "../resources/circles.png";
+
+      return new Promise(resolve => {
+        img.onload = async () => resolve();
+      });
+    }
+
+    test_fcp("Whitespace should not count as contentful.", load_image)
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/subframe-painting.html b/tests/wpt/web-platform-tests/paint-timing/resources/subframe-painting.html
index 5fb5e28d8a4..00fd39bcb81 100644
--- a/tests/wpt/web-platform-tests/paint-timing/resources/subframe-painting.html
+++ b/tests/wpt/web-platform-tests/paint-timing/resources/subframe-painting.html
@@ -4,22 +4,20 @@
 <script>
   const img = document.createElement('IMG');
   img.src = 'circles.png';
-  img.onload = function() {
-    function sendPaintEntries() {
-      const paintEntries = performance.getEntriesByType('paint');
-      if (paintEntries.length < 2) {
-        setTimeout(sendPaintEntries, 20);
-        return;
-      }
-      let entryContents = paintEntries.length + '';
+
+  var observer = new PerformanceObserver(function(list, obj) {
+    var paintEntries = list.getEntries();
       for (let i = 0; i < paintEntries.length; i++) {
-        const entry = paintEntries[i];
-        entryContents += ' ' + entry.entryType + ' '  + entry.name;
+          // postMessage doesn't allow sending the entry object over directly
+          var dataToSend = {
+              "entryType": paintEntries[i]["entryType"],
+              "name": paintEntries[i]["name"]
+          };
+          parent.postMessage(dataToSend, '*');
       }
-      parent.postMessage(entryContents, '*');
-    };
-    sendPaintEntries();
-  };
+  });
+
+  observer.observe({"type": "paint"});
   document.getElementById('image').appendChild(img);
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/paint-timing/resources/utils.js b/tests/wpt/web-platform-tests/paint-timing/resources/utils.js
index 975e84dadd4..5766971dd0d 100644
--- a/tests/wpt/web-platform-tests/paint-timing/resources/utils.js
+++ b/tests/wpt/web-platform-tests/paint-timing/resources/utils.js
@@ -32,7 +32,7 @@ async function assertFirstContentfulPaint(t) {
   });
 }
 
-async function test_fcp(label) {
+async function test_fcp(label, before_assert_fcp_func) {
   setup({"hide_test_state": true});
   const style = document.createElement('style');
   document.head.appendChild(style);
@@ -43,6 +43,9 @@ async function test_fcp(label) {
     await assertNoFirstContentfulPaint(t);
     main.className = 'preFCP';
     await assertNoFirstContentfulPaint(t);
+    if (before_assert_fcp_func) {
+      await before_assert_fcp_func();
+    }
     main.className = 'contentful';
     await assertFirstContentfulPaint(t);
   }, label);
diff --git a/tests/wpt/web-platform-tests/paint-timing/sibling-painting-first-image.html b/tests/wpt/web-platform-tests/paint-timing/sibling-painting-first-image.html
index 266d5d7af32..096c49ac19e 100644
--- a/tests/wpt/web-platform-tests/paint-timing/sibling-painting-first-image.html
+++ b/tests/wpt/web-platform-tests/paint-timing/sibling-painting-first-image.html
@@ -6,17 +6,35 @@
 <iframe id="listening-iframe" src="resources/subframe-sending-paint.html"></iframe>
 <script>
 setup({"hide_test_state": true});
+var entriesExpectToReceive = [
+    {
+        'entryType': 'paint',
+        'name': 'first-paint'
+    },
+    {
+        'entryType': 'paint',
+        'name': 'first-contentful-paint'
+    }
+];
 async_test(function (t) {
     assert_implements(window.PerformancePaintTiming, "Paint Timing isn't supported.");
     let paintingIframeHasDispatchedEntries = false;
     window.addEventListener('message', t.step_func(e => {
         if (!paintingIframeHasDispatchedEntries) {
             // Check paint-timing entries from the painting iframe.
-            assert_equals(e.data, '2 paint first-paint paint first-contentful-paint');
-            paintingIframeHasDispatchedEntries = true;
-            // Ask the listening iframe to send its paint-timing entries.
-            document.getElementById('listening-iframe').
-                contentWindow.postMessage('', '*');
+            for (let i = 0; i < entriesExpectToReceive.length; i++) {
+                if (entriesExpectToReceive[i].entryType == e.data.entryType &&
+                    entriesExpectToReceive[i].name == e.data.name) {
+                    entriesExpectToReceive.splice(i, 1);
+                    break;
+                }
+            }
+            if (entriesExpectToReceive.length == 0) {
+                paintingIframeHasDispatchedEntries = true;
+                // Ask the listening iframe to send its paint-timing entries.
+                document.getElementById('listening-iframe').
+                    contentWindow.postMessage('', '*');
+            }
             return;
         }
         // Check the paint-timing entries from the listening iframe.
diff --git a/tests/wpt/web-platform-tests/payment-request/secure-payment-confirmation.https.html b/tests/wpt/web-platform-tests/payment-request/secure-payment-confirmation.https.html
index 860876e2e9b..1cc12d49eba 100644
--- a/tests/wpt/web-platform-tests/payment-request/secure-payment-confirmation.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/secure-payment-confirmation.https.html
@@ -16,7 +16,7 @@ test(() => {
     data: {
        // All valid parameters.
        action: 'authenticate',
-       instrumentId: 'x',
+       credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
        timeout: 60000,
        fallbackUrl: 'https://fallback.example/url'
@@ -29,7 +29,7 @@ test(() => {
     supportedMethods: 'secure-payment-confirmation',
     data: {
        // Omitted action field.
-       instrumentId: 'x',
+       credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
        timeout: 60000,
        fallbackUrl: 'https://fallback.example/url'
@@ -42,7 +42,7 @@ test(() => {
     supportedMethods: 'secure-payment-confirmation',
     data: {
        action: 'authenticate',
-       instrumentId: 'x',
+       credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
        // Omitted timeout field.
        fallbackUrl: 'https://fallback.example/url'
@@ -50,6 +50,96 @@ test(() => {
   }], details);
 }, 'The timeout field is optional.');
 
+test(() => {
+  assert_throws_js(RangeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }, {supportedMethods: 'basic-card'}], details);
+  });
+}, 'Extra payment method not allowed afterward.');
+
+test(() => {
+  assert_throws_js(RangeError, () => {
+    new PaymentRequest([{supportedMethods: 'basic-card'}, {
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details);
+  });
+}, 'Extra payment method not allowed beforehand.');
+
+test(() => {
+  assert_throws_js(RangeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details, {requestShipping: true});
+  });
+}, 'Cannot request shipping information.');
+
+test(() => {
+  assert_throws_js(RangeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details, {requestPayerName: true});
+  });
+}, 'Cannot request payer name.');
+
+test(() => {
+  assert_throws_js(RangeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details, {requestPayerEmail: true});
+  });
+}, 'Cannot request payer email.');
+
+test(() => {
+  assert_throws_js(RangeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details, {requestPayerPhone: true});
+  });
+}, 'Cannot request payer phone.');
+
 test(() => {
   assert_throws_js(TypeError, () => {
     new PaymentRequest([{
@@ -57,7 +147,7 @@ test(() => {
       data: {
         // Invalid action parameter.
         action: 'authorize',
-        instrumentId: 'x',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
         networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
         timeout: 60000,
         fallbackUrl: 'https://fallback.example/url'
@@ -72,14 +162,14 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        // Omitted instrumentId field.
+        // Omitted credentialIds field.
         networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
         timeout: 60000,
         fallbackUrl: 'https://fallback.example/url'
       },
     }], details);
   });
-}, 'The instrumentId field is required.');
+}, 'The credentialIds field is required.');
 
 test(() => {
   assert_throws_js(TypeError, () => {
@@ -87,8 +177,8 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        instrumentId: 'x',
-        // Omitted instrumentId field.
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        // Omitted networkData field.
         timeout: 60000,
         fallbackUrl: 'https://fallback.example/url'
       },
@@ -102,7 +192,7 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        instrumentId: 'x',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
         networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
         timeout: 60000,
         // Omitted fallbackUrl field.
@@ -117,15 +207,16 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        // Empty instrumentId field.
-        instrumentId: '',
+        relyingPartyId: 'relying-party.example',
+        // Empty credentialIds field.
+        credentialIds: [],
         networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
         timeout: 60000,
         fallbackUrl: 'https://fallback.example/url'
       },
     }], details);
   });
-}, 'Empty instrumentId field throws exception.');
+}, 'Empty credentialIds field throws exception.');
 
 test(() => {
   assert_throws_js(TypeError, () => {
@@ -133,7 +224,7 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        instrumentId: 'x',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
         // Null networkData field.
         networkData: null,
         timeout: 60000,
@@ -149,7 +240,7 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        instrumentId: 'x',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
         // Empty networkData field.
         networkData: [],
         timeout: 60000,
@@ -165,7 +256,7 @@ test(() => {
       supportedMethods: 'secure-payment-confirmation',
       data: {
         action: 'authenticate',
-        instrumentId: 'x',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
         networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
         // Timeout longer than 1 hour.
         timeout: 1000 * 60 * 60 + 1,
@@ -174,4 +265,53 @@ test(() => {
     }], details);
   });
 }, 'Timeout longer than 1 hour throws exception.');
+
+test(() => {
+  assert_throws_js(TypeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        // Large credentialIds value.
+        credentialIds: [Uint8Array.from(
+            'x'.repeat(1024 * 1024), c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details);
+  });
+}, 'Large credentialIds value throws exception.');
+
+test(() => {
+  assert_throws_js(TypeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        // Large networkData value.
+        networkData: Uint8Array.from('x'.repeat(1024 * 1024), c => c.charCodeAt(0)),
+        timeout: 60000,
+        fallbackUrl: 'https://fallback.example/url'
+      },
+    }], details);
+  });
+}, 'Large networkData value throws exception.');
+
+test(() => {
+  assert_throws_js(TypeError, () => {
+    new PaymentRequest([{
+      supportedMethods: 'secure-payment-confirmation',
+      data: {
+        action: 'authenticate',
+        credentialIds: [Uint8Array.from('x', c => c.charCodeAt(0))],
+        networkData: Uint8Array.from('x', c => c.charCodeAt(0)),
+        timeout: 60000,
+        // Large fallbackUrl value.
+        fallbackUrl: 'https://fallback.example/ur' + 'l'.repeat(1024 * 1024)
+      },
+    }], details);
+  });
+}, 'Large fallbackUrl value throws exception.');
 </script>
diff --git a/tests/wpt/web-platform-tests/performance-timeline/case-sensitivity.any.js b/tests/wpt/web-platform-tests/performance-timeline/case-sensitivity.any.js
index 588b59cc6a7..3a98505ae67 100644
--- a/tests/wpt/web-platform-tests/performance-timeline/case-sensitivity.any.js
+++ b/tests/wpt/web-platform-tests/performance-timeline/case-sensitivity.any.js
@@ -27,3 +27,38 @@
     assert_equals(mixedList.length, 0, "getEntriesByName('" + location2 + "').length");
 
   }, "getEntriesByName values are case sensitive");
+
+  async_test(function (t) {
+    // Test type/buffered case sensitivity.
+    observer = new PerformanceObserver(
+      t.step_func(function (entryList, obs) {
+        assert_unreached("Observer(type) should not be called.");
+      })
+    );
+    observer.observe({type: "Mark"});
+    observer.observe({type: "Measure"});
+    observer.observe({type: "MARK"});
+    observer.observe({type: "MEASURE"});
+    observer.observe({type: "Mark", buffered: true});
+    observer.observe({type: "Measure", buffered: true});
+    observer.observe({type: "MARK", buffered: true});
+    observer.observe({type: "MEASURE", buffered: true});
+    self.performance.mark("mark1");
+    self.performance.measure("measure1");
+
+    // Test entryTypes case sensitivity.
+    observer = new PerformanceObserver(
+      t.step_func(function (entryList, obs) {
+        assert_unreached("Observer(entryTypes) should not be called.");
+      })
+    );
+    observer.observe({entryTypes: ["Mark", "Measure"]});
+    observer.observe({entryTypes: ["MARK", "MEASURE"]});
+    self.performance.mark("mark1");
+    self.performance.measure("measure1");
+
+    t.step_timeout(function() {
+      t.done();
+    }, 1000);
+
+  }, "observe() and case sensitivity for types/entryTypes and buffered.");
diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html b/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html
index a727325a5b1..c4990ff5f9d 100644
--- a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html
+++ b/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_mouse-pointer-preventdefault.html
@@ -18,126 +18,126 @@ div.box {
 
 <script>
 var receivedEvents = [];
+var receivedMouseEvents = [];
+var receivedPointerEvents = [];
 var mouseEventList = ["mousedown", "mouseup", "mouseenter", "mouseleave", "mouseover", "mouseout", "mousemove"];
 var pointerEventList = ["pointerdown", "pointerup", "pointerenter", "pointerleave", "pointerover", "pointerout", "pointermove"];
 
 var preventDefaultList = ["none"].concat(pointerEventList);
 var eventToPreventDefault = "";
-var seqNo = 0;
 
 function init() {
   var targetDiv = document.getElementById("target");
 
   mouseEventList.forEach(function(eventName) {
     targetDiv.addEventListener(eventName, function(event) {
-      ++seqNo;
-      receivedEvents.push(`${seqNo}.${eventName}@target`);
+      receivedEvents.push(eventName);
+      receivedMouseEvents.push(eventName);
     });
   });
 
   pointerEventList.forEach(function(eventName) {
     targetDiv.addEventListener(eventName, function(event) {
-      var preventDefaultMsg = "";
       if (event.type == eventToPreventDefault) {
         event.preventDefault();
-        preventDefaultMsg = "_prevented_default";
       }
-      ++seqNo;
-      receivedEvents.push(`${seqNo}.${eventName}@target${preventDefaultMsg}`);
+      receivedEvents.push(eventName);
+      receivedPointerEvents.push(eventName);
     });
   });
 }
 
-var expectedEvents = new Map([
-  ["none", ["1.pointerover@target", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target", "14.mousemove@target", "15.pointerout@target",
-            "16.pointerleave@target", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target", "20.pointerenter@target", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target", "24.mousemove@target",
-            "25.pointerup@target", "26.mouseup@target", "27.pointerout@target",
-            "28.pointerleave@target", "29.mouseout@target", "30.mouseleave@target"
+var expectedPointerEvents = new Map([
+  ["none", ["pointerover", "pointerenter", "pointermove", "pointerdown", "pointerup",
+            "pointerdown", "pointermove", "pointerout", "pointerleave",
+            "pointerover", "pointerenter", "pointermove", "pointerup", "pointerout",
+            "pointerleave"
             ]],
-  ["pointerdown", ["1.pointerover@target", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target_prevented_default", "8.pointerup@target",
-            "9.pointerdown@target_prevented_default",
-            "10.pointermove@target", "11.pointerout@target", "12.pointerleave@target",
-            "13.mouseout@target", "14.mouseleave@target", "15.pointerover@target",
-            "16.pointerenter@target", "17.mouseover@target", "18.mouseenter@target",
-            "19.pointermove@target", "20.pointerup@target", "21.pointerout@target",
-            "22.pointerleave@target", "23.mouseout@target", "24.mouseleave@target"
+  ["pointerdown", ["pointerover", "pointerenter", "pointermove", "pointerdown",
+            "pointerup", "pointerdown", "pointermove", "pointerout", "pointerleave",
+            "pointerover", "pointerenter", "pointermove", "pointerup", "pointerout",
+            "pointerleave"
             ]],
-  ["pointerup", ["1.pointerover@target", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target_prevented_default",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target", "14.mousemove@target", "15.pointerout@target",
-            "16.pointerleave@target", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target", "20.pointerenter@target", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target", "24.mousemove@target",
-            "25.pointerup@target_prevented_default", "26.mouseup@target", "27.pointerout@target",
-            "28.pointerleave@target", "29.mouseout@target", "30.mouseleave@target"]],
-  ["pointerenter", ["1.pointerover@target", "2.pointerenter@target_prevented_default", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target", "14.mousemove@target", "15.pointerout@target",
-            "16.pointerleave@target", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target", "20.pointerenter@target_prevented_default", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target", "24.mousemove@target",
-            "25.pointerup@target", "26.mouseup@target", "27.pointerout@target",
-            "28.pointerleave@target", "29.mouseout@target", "30.mouseleave@target"]],
-  ["pointerleave", ["1.pointerover@target", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target", "14.mousemove@target", "15.pointerout@target",
-            "16.pointerleave@target_prevented_default", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target", "20.pointerenter@target", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target", "24.mousemove@target",
-            "25.pointerup@target", "26.mouseup@target", "27.pointerout@target",
-            "28.pointerleave@target_prevented_default", "29.mouseout@target", "30.mouseleave@target"]],
-  ["pointerover", ["1.pointerover@target_prevented_default", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target", "14.mousemove@target", "15.pointerout@target",
-            "16.pointerleave@target", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target_prevented_default", "20.pointerenter@target", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target", "24.mousemove@target",
-            "25.pointerup@target", "26.mouseup@target", "27.pointerout@target",
-            "28.pointerleave@target", "29.mouseout@target", "30.mouseleave@target"]],
-  ["pointerout", ["1.pointerover@target", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target", "14.mousemove@target", "15.pointerout@target_prevented_default",
-            "16.pointerleave@target", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target", "20.pointerenter@target", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target", "24.mousemove@target",
-            "25.pointerup@target", "26.mouseup@target", "27.pointerout@target_prevented_default",
-            "28.pointerleave@target", "29.mouseout@target", "30.mouseleave@target"]],
-  ["pointermove", ["1.pointerover@target", "2.pointerenter@target", "3.mouseover@target",
-            "4.mouseenter@target", "5.pointermove@target_prevented_default", "6.mousemove@target",
-            "7.pointerdown@target", "8.mousedown@target", "9.pointerup@target",
-            "10.mouseup@target", "11.pointerdown@target", "12.mousedown@target",
-            "13.pointermove@target_prevented_default", "14.mousemove@target", "15.pointerout@target",
-            "16.pointerleave@target", "17.mouseout@target", "18.mouseleave@target",
-            "19.pointerover@target", "20.pointerenter@target", "21.mouseover@target",
-            "22.mouseenter@target", "23.pointermove@target_prevented_default", "24.mousemove@target",
-            "25.pointerup@target", "26.mouseup@target", "27.pointerout@target",
-            "28.pointerleave@target", "29.mouseout@target", "30.mouseleave@target"]]
-]);
+  ["pointerup", ["pointerover", "pointerenter", "pointermove", "pointerdown",
+            "pointerup", "pointerdown", "pointermove", "pointerout", "pointerleave",
+            "pointerover", "pointerenter", "pointermove", "pointerup",
+            "pointerout", "pointerleave"
+            ]],
+  ["pointerenter", ["pointerover", "pointerenter", "pointermove",
+            "pointerdown", "pointerup", "pointerdown", "pointermove",
+            "pointerout", "pointerleave", "pointerover", "pointerenter",
+            "pointermove", "pointerup", "pointerout", "pointerleave"
+            ]],
+  ["pointerleave", ["pointerover", "pointerenter", "pointermove",
+            "pointerdown", "pointerup", "pointerdown", "pointermove",
+            "pointerout", "pointerleave", "pointerover", "pointerenter",
+            "pointermove", "pointerup", "pointerout", "pointerleave"
+            ]],
+  ["pointerover", ["pointerover", "pointerenter", "pointermove",
+            "pointerdown", "pointerup", "pointerdown", "pointermove",
+            "pointerout", "pointerleave", "pointerover", "pointerenter",
+            "pointermove", "pointerup", "pointerout",
+            "pointerleave"
+            ]],
+  ["pointerout", ["pointerover", "pointerenter", "pointermove",
+            "pointerdown", "pointerup", "pointerdown", "pointermove",
+            "pointerout", "pointerleave", "pointerover", "pointerenter",
+            "pointermove", "pointerup", "pointerout",
+            "pointerleave"
+            ]],
+  ["pointermove", ["pointerover", "pointerenter", "pointermove",
+            "pointerdown", "pointerup", "pointerdown", "pointermove",
+            "pointerout", "pointerleave", "pointerover", "pointerenter",
+            "pointermove", "pointerup", "pointerout", "pointerleave"
+            ]]
+  ]);
+var expectedMouseEvents = new Map([
+  ["none", ["mouseover", "mouseenter", "mousemove", "mousedown", "mouseup",
+            "mousedown", "mousemove", "mouseout", "mouseleave",
+            "mouseover", "mouseenter", "mousemove", "mouseup", "mouseout", "mouseleave"
+            ]],
+  ["pointerdown", ["mouseover", "mouseenter", "mousemove",
+            "mouseout", "mouseleave", "mouseover", "mouseenter",
+            "mouseout", "mouseleave"
+            ]],
+  ["pointerup", ["mouseover", "mouseenter", "mousemove",
+            "mousedown", "mouseup", "mousedown", "mousemove",
+            "mouseout", "mouseleave", "mouseover",
+            "mouseenter", "mousemove", "mouseup", "mouseout", "mouseleave"
+            ]],
+  ["pointerenter", ["mouseover", "mouseenter", "mousemove", "mousedown",
+            "mouseup", "mousedown", "mousemove", "mouseout", "mouseleave",
+            "mouseover", "mouseenter", "mousemove", "mouseup", "mouseout", "mouseleave"
+            ]],
+  ["pointerleave", ["mouseover", "mouseenter", "mousemove", "mousedown",
+            "mouseup", "mousedown", "mousemove", "mouseout", "mouseleave",
+            "mouseover", "mouseenter", "mousemove", "mouseup",
+            "mouseout", "mouseleave"
+            ]],
+  ["pointerover", ["mouseover", "mouseenter", "mousemove",
+            "mousedown", "mouseup", "mousedown", "mousemove", "mouseout",
+            "mouseleave", "mouseover", "mouseenter", "mousemove", "mouseup",
+            "mouseout", "mouseleave"
+            ]],
+  ["pointerout", ["mouseover", "mouseenter", "mousemove",
+            "mousedown", "mouseup", "mousedown", "mousemove",
+            "mouseout", "mouseleave", "mouseover", "mouseenter",
+            "mousemove", "mouseup", "mouseout", "mouseleave"
+            ]],
+  ["pointermove", ["mouseover", "mouseenter", "mousemove",
+            "mousedown", "mouseup", "mousedown", "mousemove",
+            "mouseout", "mouseleave", "mouseover", "mouseenter",
+            "mousemove", "mouseup", "mouseout", "mouseleave"
+            ]]
+  ]);
 
 async function runTestForDefaultEvent(preventDefaultEvent) {
     promise_test((test)=>
     new Promise(async (resolve, reject)=>{
         test.add_cleanup(()=>{
           receivedEvents = [];
-          seqNo = 0;
+          receivedPointerEvents = [];
+          receivedMouseEvents = [];
           eventToPreventDefault = "";
         });
         eventToPreventDefault = preventDefaultEvent;
@@ -150,7 +150,12 @@ async function runTestForDefaultEvent(preventDefaultEvent) {
           reject(e);
         }
         test.step(()=>{
-          assert_array_equals(expectedEvents.get(preventDefaultEvent), receivedEvents);});
+          if(eventToPreventDefault === 'none'){
+            assert_true(arePointerEventsBeforeCompatMouseEvents(receivedEvents), "There are no compatible mouse events for all pointer events:" + receivedEvents);
+          }
+          assert_array_equals(receivedPointerEvents, expectedPointerEvents.get(preventDefaultEvent));
+          assert_array_equals(receivedMouseEvents, expectedMouseEvents.get(preventDefaultEvent));
+        });
         resolve();
     }), `Verifies the effect of pointer event prevent-default on ${preventDefaultEvent}`);
 }
@@ -169,7 +174,7 @@ function performActions(test, preventDefaultEvent){
   let x2 = Math.ceil(rect.left + 3);
   let y2 = Math.ceil(rect.top + 5);
 
-  let eventWatcher = new EventWatcher(test, targetDiv, ["mouseleave"], ()=>waitForAnimationFrames(900));
+  let eventWatcher = new EventWatcher(test, targetDiv, ["mouseleave"]);
   // wait for all expected events to happen.
   // Because each test ends with mouseleave and there are 2 mouseleave events,
   // we use EventWatcher to wait for the two mouseleave events to happen
@@ -186,7 +191,7 @@ function performActions(test, preventDefaultEvent){
                 .pointerDown()
                 .pointerMove(x2+5, y2+5)
                 .pointerMove(x1, y1)
-                .pointerMove(x2, y2)
+                .pointerMove(x2+1, y2+1)
                 .pointerUp()
                 // move outside target again
                 .pointerMove(x1, y1)
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html
new file mode 100644
index 00000000000..24b65213ecc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_mouse_pointercapture_inactivate_pointer.html
@@ -0,0 +1,82 @@
+<!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>
+<style>
+    iframe {
+      width: 300px;
+      height: 300px;
+      top: 100px;
+      left: 100px;
+      border: 0;
+      position: absolute;
+      background: green;
+    }
+    #outerFrame {
+      width: 500px;
+      height: 500px;
+      background: blue;
+    }
+</style>
+<body onload="run()">
+    <div id='outerFrame'>
+        <iframe id='iframe' src="resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html"></iframe>
+    </div>
+</body>
+
+<script type="text/javascript">
+    function run() {
+    capture_count = 0;
+
+    document.addEventListener("gotpointercapture", function(){
+        capture_count ++;
+    })
+
+    iframe.contentDocument.addEventListener("gotpointercapture", function(){
+        capture_count ++;
+    })
+
+    document.addEventListener("pointerdown", function(event){
+        // Outer frame got pointer down, set capture to inner frame.
+        iframe.contentDocument.getElementById("target").setPointerCapture(event.pointerId);
+    });
+
+
+    iframe.contentDocument.addEventListener("pointerdown", function(event){
+        // Inner frame got pointer down, set capture to outer frame.
+        outerFrame.setPointerCapture(event.pointerId);
+    });
+
+
+    promise_test(async(test) => {
+      let eventWatcher = new EventWatcher(test, document, ["pointerup"]);
+      let donePromise = eventWatcher.wait_for(["pointerup"], { record: 'all' });
+      await injectEvent(50, 50);
+      // wait for pointerUp before running the test
+      await donePromise;
+      assert_equals(capture_count, 0, "Inner frame can not capture when pointer is activate in outer frame")
+    }, "setPointerCapture: pointer active in outer frame, set capture to inner frame");
+
+
+    promise_test(async(test) => {
+      let eventWatcher = new EventWatcher(test, iframe.contentDocument, ["pointerup"]);
+      let donePromise = eventWatcher.wait_for(["pointerup"], { record: 'all' });
+      await injectEvent(250, 250);
+      // wait for pointerUp before running the test
+      await donePromise;
+      assert_equals(capture_count, 0, "Outer frame can not capture when pointer is activate in inner frame")
+    }, "setPointerCapture: pointer active in inner frame, set capture to outer frame");
+
+    function injectEvent(x, y) {
+        return new test_driver.Actions()
+            .pointerMove(x, y)
+            .pointerDown()
+            .pointerMove(x, y)
+            .pointerUp()
+            .send();
+    }
+}
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-adjustment_click_target.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-adjustment_click_target.html
new file mode 100644
index 00000000000..46d5ac1793b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-adjustment_click_target.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Touch-generated events should have the same target</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>
+<p>Touch letter 'O' below to run the test. If a "PASS" result appears the test passes, otherwise it fails</p>
+<p><a href="#" id="link">Link</a> <span id="target">O</span></p>
+<div id="log"></div>
+<script>
+let input_gesture;
+const target = document.getElementById('target');
+const xPosition = Math.ceil(target.offsetLeft + 2);
+const yPosition = Math.ceil(target.offsetTop + 2);
+
+function inject_input() {
+  let actions = new test_driver.Actions();
+  return actions
+        .addPointer("touchPointer", "touch")
+        .setPointer("touchPointer")
+        .pointerMove(xPosition, yPosition)
+        .pointerDown()
+        .pointerUp()
+        .send();
+}
+
+
+addEventListener('load', () => {
+  input_gesture = inject_input();
+});
+
+async_test(t => {
+    const link = document.getElementById('link');
+    const expectedEventLog = ['pointerdown-link', 'touchstart-link', 'pointerup-link', 'touchend-link', 'click-link'];
+    const eventLogRecorder = [];
+
+    const eventNames = ['touchstart', 'touchmove', 'touchend', 'pointerdown', 'pointermove', 'pointerup', 'click'];
+    for (eventName of eventNames) {
+        document.addEventListener(eventName, t.step_func(event => {
+            // TouchEvent and PointerEvent should have the same un-adjusted coordinates.
+            // click event should have coordinates adjusted to link element.
+            const eventClientX = event.clientX || (event.touches.length > 0 ? event.touches[0].clientX : 0);
+            const eventClientY = event.clientY || (event.touches.length > 0 ? event.touches[0].clientY : 0);
+
+            if (event.type === 'click') {
+                assert_equals(document.elementFromPoint(eventClientX, eventClientY), link,
+                    'click should have clientX/Y adjusted to link.');
+            } else if (event.type != 'touchend') {
+                assert_equals(eventClientX, xPosition,
+                    `${event.type} should have un-adjusted x coordinates.`);
+                assert_equals(eventClientY, yPosition,
+                    `${event.type} should have un-adjusted y coordinates.`);
+            }
+
+            // All events should have target adjusted to link.
+            const targetName = event.target.id || event.target.nodeName || '[null]';
+            eventLogRecorder.push(`${event.type}-${targetName}`);
+            if (event.type === 'click') {
+                assert_array_equals(eventLogRecorder, expectedEventLog);
+                input_gesture.then(() => { t.done(); });
+            }
+        }));
+    }
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html
index eaa5325699d..92fcc93699b 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html
@@ -35,7 +35,7 @@
             var firstButton = 0;
             var pointer_locked = false;
 
-            function run() {
+            async function run() {
                 var target0 = document.getElementById("target0");
 
                 // When a pointer changes button state and the circumstances produce no other pointer event, the pointermove event must be dispatched.
@@ -44,7 +44,9 @@
                 on_event(target0, "pointerdown", function (event) {
                     if (pointer_locked) {
                         detected_pointertypes[event.pointerType] = true;
-                        test_pointermove.step(function() {assert_true(step === 0, "There must not be more than one pointer down event.");});
+                        test_pointermove.step(function() {
+                            assert_true(step === 0, "There must not be more than one pointer down event.");
+                        });
                         if (step == 0) {
                             step = 1;
                             firstButton = event.buttons;
@@ -56,11 +58,17 @@
                         detected_pointertypes[event.pointerType] = true;
 
                         if (step == 1 && event.button != -1) { // second button pressed
-                            test_pointermove.step(function() {assert_true(event.buttons !== firstButton, "The pointermove event must be triggered by pressing a second button.");});
-                            test_pointermove.step(function() {assert_true((event.buttons & firstButton) != 0, "The first button must still be reported pressed.");});
+                            test_pointermove.step(function() {
+                                assert_true(event.buttons !== firstButton, "The pointermove event must be triggered by pressing a second button.");
+                            });
+                            test_pointermove.step(function() {
+                                assert_true((event.buttons & firstButton) != 0, "The first button must still be reported pressed.");
+                            });
                             step = 2;
                         } else if (step == 2 && event.button != -1) { // second button released
-                            test_pointermove.step(function() {assert_true(event.buttons === firstButton, "The pointermove event must be triggered by releasing the second button.");});
+                            test_pointermove.step(function() {
+                                assert_true(event.buttons === firstButton, "The pointermove event must be triggered by releasing the second button.");
+                            });
                             step = 3;
                         }
                     }
@@ -68,14 +76,13 @@
                 on_event(target0, "pointerup", function (event) {
                     if (pointer_locked) {
                         detected_pointertypes[event.pointerType] = true;
-                        step_timeout(function() {
-                            test_pointermove.step(function() {assert_true(step === 3, "The pointerup event must be triggered after pressing and releasing the second button.");});
-                            test_pointermove.step(function() {assert_true(event.buttons === 0, "The pointerup event must be triggered by releasing the last pressed button.");});
-                            document.exitPointerLock();
-                            actions_promise.then( () => {
-                                test_pointermove.done();
-                            });
-                        }, 500);
+                        test_pointermove.step(function() {
+                            assert_true(step === 3, "The pointerup event must be triggered after pressing and releasing the second button.");
+                        });
+                        test_pointermove.step(function() {
+                            assert_true(event.buttons === 0, "The pointerup event must be triggered by releasing the last pressed button.");
+                        });
+                        document.exitPointerLock();
                     } else {
                         target0.requestPointerLock();
                     }
@@ -83,8 +90,12 @@
                 on_event(document, 'pointerlockchange', function(event) {
                     if (document.pointerLockElement == target0)
                         pointer_locked = true;
-                    else
+                    else{
                         pointer_locked = false;
+                        actions_promise.then( () => {
+                           test_pointermove.done();
+                        });
+                    }
                 });
                 on_event(target0, "mouseup", function (event) {
                     event.preventDefault();
@@ -95,9 +106,16 @@
 
                 // Inject mouse input
                 var actions = new test_driver.Actions();
-                actions_promise = actions.pointerMove(0, 0, {origin: target0})
+                actions_promise = actions
+                       .pointerMove(0, 0, {origin: target0})
                        .pointerDown({button: actions.ButtonType.LEFT})
                        .pointerUp({button: actions.ButtonType.LEFT})
+                       .send();
+                await actions_promise;
+                await resolveWhen(()=>pointer_locked);
+                actions = new test_driver.Actions();
+                actions_promise = actions
+                       .pointerMove(0, 0, {origin: target0})
                        .pointerDown({button: actions.ButtonType.LEFT})
                        .pointerDown({button: actions.ButtonType.MIDDLE})
                        .pointerUp({button: actions.ButtonType.MIDDLE})
diff --git a/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html b/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html
new file mode 100644
index 00000000000..3c88328b004
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/resources/pointerevent_mouse_pointercapture_inactivate_pointer-iframe.html
@@ -0,0 +1,3 @@
+<body id='innerFrame' style='height:500px; width: 500px; padding: 0; margin: 0;'>
+  <div id = 'target'></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html b/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html
index 93ee8ecdc09..fd3ac18f69d 100644
--- a/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-host-exposure.sub.html
@@ -1,31 +1,39 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="resources/stash-utils.sub.js"></script>
+<script src="/common/utils.js"></script>
 <body>
 <script>
-  function openPortalAndReceiveMessage(portalSrc) {
+  function openPortal(portalSrc) {
     assert_implements("HTMLPortalElement" in self);
-    let portal = document.createElement('portal');
+    const portal = document.createElement('portal');
     portal.src = portalSrc;
-    let received = new Promise((resolve, reject) => {
-      portal.onmessage = resolve;
-      document.body.appendChild(portal);
-    });
-    return received;
+    return portal;
   }
 
-  promise_test(() => {
-    return openPortalAndReceiveMessage("resources/portal-host.html");
+  async function openPortalAndReceiveMessage(portalSrc) {
+    const key = token();
+    const portal = openPortal(`${portalSrc}?key=${key}`);
+    document.body.appendChild(portal);
+    return StashUtils.takeValue(key);
+  }
+
+  promise_test(async () => {
+    const result = await openPortalAndReceiveMessage("resources/portal-host.html");
+    assert_equals(result, "passed");
   }, "window.portalHost should be exposed in same-origin portal");
 
-  promise_test(() => {
-    return openPortalAndReceiveMessage(
+  promise_test(async () => {
+    const result = await openPortalAndReceiveMessage(
         "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-host.html");
+    assert_equals(result, "passed");
   }, "window.portalHost should be exposed in cross-origin portal");
 
-  promise_test(() => {
-    return openPortalAndReceiveMessage(
+  promise_test(async () => {
+    const result = await openPortalAndReceiveMessage(
         'resources/portal-host-cross-origin-navigate.sub.html');
+    assert_equals(result, "passed");
   }, "window.portalHost should be exposed in portal after cross-origin navigation");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html b/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html
index e547642c9f2..aa4893cb904 100644
--- a/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-host-post-message.sub.html
@@ -26,35 +26,23 @@
       return waitForResponse;
     }
 
-    const crossOriginUrl = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-host-post-message.sub.html";
+    const sameOriginUrl = "resources/portal-host-post-message.html";
+    const crossOriginUrl = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-host-post-message-x-origin.html";
 
     promise_test(async () => {
-      var {data, origin} = await createPortalAndLoopMessage(
-          "resources/portal-host-post-message.sub.html", ["test", "*"]);
+      var {data, origin} = await createPortalAndLoopMessage(sameOriginUrl,
+                                                            ["test", "*"]);
       assert_equals(data, "test");
       assert_equals(origin, "http://{{host}}:{{ports[http][0]}}");
     }, "Message received after postMessage from portal host");
 
     promise_test(async () => {
-      var {data, origin} = await createPortalAndLoopMessage(
-          crossOriginUrl, ["test", "*"]);
-      assert_equals(data, "test");
-      assert_equals(origin, "http://{{hosts[alt][www]}}:{{ports[http][0]}}");
-    }, "Message received after postMessage from portal host in cross-origin-portal");
-
-    promise_test(async () => {
-      var {data, origin} = await createPortalAndLoopMessage(
-          "resources/portal-host-post-message.sub.html", ["test"]);
+      var {data, origin} = await createPortalAndLoopMessage(sameOriginUrl,
+                                                            ["test"]);
       assert_equals(data, "test");
       assert_equals(origin, "http://{{host}}:{{ports[http][0]}}");
     }, "Message received from same-origin portal host with no target origin specified");
 
-    promise_test(async () => {
-      var {data, origin} = await createPortalAndLoopMessage(
-         crossOriginUrl, ["test", "http://{{host}}:{{ports[http][0]}}"]);
-      assert_equals(data, "test");
-    }, "Message received from cross-origin portal host with target origin correctly specified");
-
     promise_test(async () => {
       var message = {
         prop1: "value1",
@@ -64,10 +52,7 @@
           prop4_1: "value4_1"
         }
       };
-      var {data} = await createPortalAndLoopMessage(
-        "resources/portal-host-post-message.sub.html", [message]);
-      assert_object_equals(data, message);
-      var {data} = await createPortalAndLoopMessage(crossOriginUrl,
+      var {data} = await createPortalAndLoopMessage(sameOriginUrl,
                                                     [message, "*"]);
       assert_object_equals(data, message);
     }, "postMessage with object message");
@@ -82,58 +67,39 @@
         });
       }
 
-      var {ports} = await createPortalAndLoopMessage(
-        "resources/portal-host-post-message.sub.html",
-        {type: "message-port"});
-      await checkPort(ports[0]);
-
-      var {ports} = await createPortalAndLoopMessage(
-        crossOriginUrl,
-        {type: "message-port"});
+      var {ports} = await createPortalAndLoopMessage(sameOriginUrl, {
+        type: "message-port"
+      });
       await checkPort(ports[0]);
     }, "postMessage with message ports");
 
     promise_test(async () => {
-      var {data} = await createPortalAndLoopMessage(
-        "resources/portal-host-post-message.sub.html", {
-          type: "array-buffer-without-transfer",
-          array: [0, 1, 2, 3, 4]
-      });
-      assert_array_equals([0, 1, 2, 3, 4], new Int8Array(data.arrayBuffer));
-
-      var {data} = await createPortalAndLoopMessage(crossOriginUrl, {
-          type: "array-buffer-without-transfer",
-          array: [0, 1, 2, 3, 4]
+      var {data} = await createPortalAndLoopMessage(sameOriginUrl, {
+        type: "array-buffer-without-transfer",
+        array: [0, 1, 2, 3, 4]
       });
       assert_array_equals([0, 1, 2, 3, 4], new Int8Array(data.arrayBuffer));
     }, "postMessage with array buffer without transfer");
 
     promise_test(async () => {
-      var {data} = await createPortalAndLoopMessage(
-        "resources/portal-host-post-message.sub.html", {
-          type: "array-buffer-with-transfer",
-          array: [0, 1, 2, 3, 4]
-      });
-      assert_array_equals([0, 1, 2, 3, 4], new Int8Array(data.arrayBuffer));
-
-      var {data} = await createPortalAndLoopMessage(crossOriginUrl, {
-          type: "array-buffer-with-transfer",
-          array: [0, 1, 2, 3, 4]
+      var {data} = await createPortalAndLoopMessage(sameOriginUrl, {
+        type: "array-buffer-with-transfer",
+        array: [0, 1, 2, 3, 4]
       });
       assert_array_equals([0, 1, 2, 3, 4], new Int8Array(data.arrayBuffer));
     }, "postMessage with array buffer with transfer");
 
     promise_test(async () => {
-      var {data} = await createPortalAndLoopMessage(
-        "resources/portal-host-post-message.sub.html",
-        {type: "invalid-message"});
+      var {data} = await createPortalAndLoopMessage(sameOriginUrl, {
+        type: "invalid-message"
+      });
       assert_equals(data.errorType, "DataCloneError");
     }, "postMessage should throw error when serialization fails");
 
     promise_test(async () => {
-      var {data} = await createPortalAndLoopMessage(
-        "resources/portal-host-post-message.sub.html",
-        {type: "invalid-port"});
+      var {data} = await createPortalAndLoopMessage(sameOriginUrl,{
+        type: "invalid-port"
+      });
       assert_equals(data.errorType, "TypeError");
     }, "postMessage with invalid transferable should throw error");
 
@@ -166,18 +132,14 @@
       return waitForMessages;
     }, "postMessage before and after portal navigation should work");
 
-    async_test(t => {
-      createPortalAndLoopMessage("resources/portal-host-post-message.sub.html",
-          ["test", "http://{{hosts[alt][www]}}:{{ports[http][0]}}"])
-          .then(t.step_func(() => { assert_unreached("message delivered"); }));
-      t.step_timeout(t.done, 2000);
-    }, "Message should not be received from portal host with target set to different origin");
+    const TIMEOUT_DURATION_MS = 1000;
 
-    async_test(t => {
-      createPortalAndLoopMessage(crossOriginUrl, ["test"]).then(t.step_func(() => {
-        assert_unreached("message delivered");
-      }));
-      t.step_timeout(t.done, 2000);
-    }, "Message should not be received cross origin-portal host with no target origin set");
+    promise_test(t => new Promise((resolve, reject) => {
+      const portal = document.createElement('portal');
+      portal.src = crossOriginUrl;
+      portal.onmessage = () => reject('should not have received message');
+      document.body.appendChild(portal);
+      t.step_timeout(resolve, TIMEOUT_DURATION_MS);
+    }), "postMessage from portal host in cross-origin-portal should be blocked");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html b/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html
index 2f6b25d97da..19803f68696 100644
--- a/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html
+++ b/tests/wpt/web-platform-tests/portals/portals-post-message.sub.html
@@ -5,11 +5,13 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/stash-utils.sub.js"></script>
+<script src="/common/utils.js"></script>
 <body>
   <input id="input"/>
   <script>
     const sameOriginUrl = "resources/portal-post-message-portal.html"
-    const crossOriginUrl = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-post-message-portal.html"
+    const crossOriginUrl = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-post-message-x-origin-portal.html"
 
     async function createAndInsertPortal(portalSrc) {
       assert_implements("HTMLPortalElement" in self);
@@ -51,15 +53,6 @@
       assert_true(sourceIsPortalHost);
     }, "postMessage message received by portalHost");
 
-    promise_test(async () => {
-      var portal = await createAndInsertPortal(crossOriginUrl);
-      var message = "test message";
-      var {origin, data, sourceIsPortalHost} = await postMessage(portal, message, "*");
-      assert_equals(data, message);
-      assert_equals(origin, window.location.origin);
-      assert_true(sourceIsPortalHost);
-    }, "postMessage message received by portalHost in cross-origin portal");
-
     promise_test(async () => {
       var portal = await createAndInsertPortal(sameOriginUrl);
       var message = "test message";
@@ -72,14 +65,6 @@
       assert_equals(data, message);
     }, "postMessage received by portal host in same-origin portal for multiple valid target origins");
 
-    promise_test(async () => {
-      var portal = await createAndInsertPortal(crossOriginUrl);
-      var message = "test message";
-      var {data} = await postMessage(portal, message,
-          "http://{{hosts[alt][www]}}:{{ports[http][0]}}");
-      assert_equals(data, message);
-    }, "postMessage received by portal host in cross-origin portal when target origin is specified");
-
     promise_test(async () => {
       var portal = await createAndInsertPortal(sameOriginUrl);
       var message = {
@@ -101,13 +86,6 @@
       assert_equals(data, message);
     }, "postMessage with message ports and same-origin portal");
 
-    promise_test(async () => {
-      var portal = await createAndInsertPortal(crossOriginUrl);
-      var message = "test message";
-      var {data} = await postMessageWithMessagePorts(portal, message, "*");
-      assert_equals(data, message);
-    }, "postMessage with message ports and cross-origin portal");
-
     promise_test(async () => {
       var portal = await createAndInsertPortal(sameOriginUrl);
       var arrayBuffer = new ArrayBuffer(5);
@@ -206,26 +184,18 @@
       assert_equals(error, "InvalidStateError");
     }, "postMessage after activate throws error");
 
-    // TODO(adithyas): Use async_test instead of promise_test (for tests that
-    // use a timeout) once we implement postMessage in the other direction and
-    // no longer need to use broadcast channel.
     const TIMEOUT_DURATION_MS = 1000;
 
     promise_test(async t => {
-      var portal = await createAndInsertPortal(crossOriginUrl);
-      return new Promise((resolve, reject) => {
-        postMessage(portal, "test").then(() => { reject("message delivered"); });
-        t.step_timeout(resolve, TIMEOUT_DURATION_MS);
-      });
-    }, "message should not be delivered to cross-origin portal when targetOrigin is not specified");
+      const key = token();
+      const portal = await createAndInsertPortal(`${crossOriginUrl}?key=${key}`);
+      portal.postMessage('test message', '*');
+      t.step_timeout(() => {
+        StashUtils.putValue(key, 'passed');
+      }, TIMEOUT_DURATION_MS);
+      const result = await StashUtils.takeValue(key);
+      assert_equals(result, 'passed');
+    }, 'postMessage should be blocked for cross-origin portals');
 
-    promise_test(async t => {
-      var portal = await createAndInsertPortal(sameOriginUrl);
-      return new Promise((resolve, reject) => {
-        postMessage(portal, "test", "http://differentorigin.com:8002").then(
-          () => { reject("message delivered"); });
-        t.step_timeout(resolve, TIMEOUT_DURATION_MS);
-      });
-    }, "message should not be delivered to portal when targetOrigin does not match");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-cross-origin-navigate.sub.html b/tests/wpt/web-platform-tests/portals/resources/portal-host-cross-origin-navigate.sub.html
index ce7aaf84648..26f655a0dbf 100644
--- a/tests/wpt/web-platform-tests/portals/resources/portal-host-cross-origin-navigate.sub.html
+++ b/tests/wpt/web-platform-tests/portals/resources/portal-host-cross-origin-navigate.sub.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <body>
   <script>
-    let channelName = new URL(location).searchParams.get('broadcastchannel');
-    window.location.href = `http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-host.html`;
+    let key = (new URLSearchParams(window.location.search)).get('key');
+    window.location.href = `http://{{hosts[alt][www]}}:{{ports[http][0]}}/portals/resources/portal-host.html?key=${key}`;
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-x-origin.html b/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-x-origin.html
new file mode 100644
index 00000000000..eb390e8b539
--- /dev/null
+++ b/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message-x-origin.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<script>
+  window.portalHost.postMessage('test message', '*');
+</script>
diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message.sub.html b/tests/wpt/web-platform-tests/portals/resources/portal-host-post-message.html
similarity index 100%
rename from tests/wpt/web-platform-tests/portals/resources/portal-host-post-message.sub.html
rename to tests/wpt/web-platform-tests/portals/resources/portal-host-post-message.html
diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-host.html b/tests/wpt/web-platform-tests/portals/resources/portal-host.html
index 3a407d8c325..e5772082364 100644
--- a/tests/wpt/web-platform-tests/portals/resources/portal-host.html
+++ b/tests/wpt/web-platform-tests/portals/resources/portal-host.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
+<script src="stash-utils.sub.js"></script>
 <body>
   <script>
-    if (window.portalHost)
-      window.portalHost.postMessage("has host", "*");
+    let queryParams = new URLSearchParams(window.location.search);
+    let key = queryParams.get('key');
+    if (key) {
+      StashUtils.putValue(key, window.portalHost ? "passed" : "failed");
+    }
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/portals/resources/portal-post-message-x-origin-portal.html b/tests/wpt/web-platform-tests/portals/resources/portal-post-message-x-origin-portal.html
new file mode 100644
index 00000000000..57631f385c1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/portals/resources/portal-post-message-x-origin-portal.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<script src="stash-utils.sub.js"></script>
+<script>
+  const queryParams = new URLSearchParams(window.location.search);
+  const key = queryParams.get('key');
+  if (key) {
+    window.portalHost.onmessage = () => {
+      StashUtils.putValue(key, 'failed');
+    };
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/portals/resources/stash-utils.sub.js b/tests/wpt/web-platform-tests/portals/resources/stash-utils.sub.js
new file mode 100644
index 00000000000..30efe836331
--- /dev/null
+++ b/tests/wpt/web-platform-tests/portals/resources/stash-utils.sub.js
@@ -0,0 +1,43 @@
+const STASH_RESPONDER = "wss://{{host}}:{{ports[wss][0]}}/stash_responder_blocking";
+
+class StashUtils {
+  /**
+   * Sends a request to store (|key|, |tuple|) in Stash
+   * (https://web-platform-tests.org/tools/wptserve/docs/stash.html).
+   * @param {string} key A UUID that acts as a key that can be used to retrieve |value| later.
+   * @param {string} value Value to be stored in Stash.
+   * @returns {Promise} Promise that resolves once the server responds.
+   */
+  static putValue(key, value) {
+    return new Promise(resolve => {
+        const ws = new WebSocket(STASH_RESPONDER);
+        ws.onopen = () => {
+          ws.send(JSON.stringify({action: 'set', key: key, value: value}));
+        };
+        ws.onmessage = e => {
+          ws.close();
+          resolve();
+        };
+    });
+  }
+
+  /**
+   * Retrieves value associated with |key| in Stash. If no value has been
+   * associated with |key| yet, the method waits for putValue to be called with
+   * |key|, and a value to be associated, before resolving the return promise.
+   * @param {string} key A UUID that uniquely identifies the value to retrieve.
+   * @returns {Promise<string>} A promise that resolves with the value associated with |key|.
+   */
+  static takeValue(key) {
+    return new Promise(resolve => {
+      const ws = new WebSocket(STASH_RESPONDER);
+      ws.onopen = () => {
+        ws.send(JSON.stringify({action: 'get', key: key}));
+      };
+      ws.onmessage = e => {
+        ws.close();
+        resolve(JSON.parse(e.data).value);
+      };
+    });
+  }
+}
diff --git a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload-style.html b/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload-style.html
new file mode 100644
index 00000000000..29971383409
--- /dev/null
+++ b/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload-style.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/preload/resources/preload_helper.js"></script>
+<script>
+    var t = async_test('Makes sure link preload preloaded resources are not delaying onload');
+</script>
+<link rel=preload href="resources/dummy.css?pipe=trickle(d5)" as=style>
+<script>
+    window.addEventListener("load", t.step_func(function() {
+        verifyPreloadAndRTSupport();
+        verifyNumberOfResourceTimingEntries("resources/dummy.css?pipe=trickle(d5)", 0);
+        t.done();
+    }));
+</script>
diff --git a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload.html b/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload.html
index a1b19c81c67..6b9b577b89c 100644
--- a/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload.html
+++ b/tests/wpt/web-platform-tests/preload/avoid-delaying-onload-link-preload.html
@@ -9,7 +9,7 @@
 <script>
     window.addEventListener("load", t.step_func(function() {
         verifyPreloadAndRTSupport();
-        verifyNumberOfResourceTimingEntries("/resources/dummy.js?pipe=trickle(d5)", 0);
+        verifyNumberOfResourceTimingEntries("resources/dummy.js?pipe=trickle(d5)", 0);
         t.done();
     }));
 </script>
diff --git a/tests/wpt/web-platform-tests/raw-sockets/META.yml b/tests/wpt/web-platform-tests/raw-sockets/META.yml
new file mode 100644
index 00000000000..d424a0af6ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/raw-sockets/META.yml
@@ -0,0 +1,5 @@
+spec: https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md
+suggested_reviewers:
+  - ewilligers
+  - mgiuca
+  - phoglenix
diff --git a/tests/wpt/web-platform-tests/raw-sockets/README.md b/tests/wpt/web-platform-tests/raw-sockets/README.md
new file mode 100644
index 00000000000..bcebe03c8f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/raw-sockets/README.md
@@ -0,0 +1,2 @@
+These tests are for the TCP and UDP sockets API proposed in
+https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md
diff --git a/tests/wpt/web-platform-tests/raw-sockets/open-consume-activation.https.html b/tests/wpt/web-platform-tests/raw-sockets/open-consume-activation.https.html
new file mode 100644
index 00000000000..f6dda4488ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/raw-sockets/open-consume-activation.https.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Sockets test: consume user activation</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>
+  </head>
+  <body>
+    <script>
+      'use strict';
+
+      const options = { remoteAddress: "127.0.0.1" };
+
+      promise_test(async t => {
+        // Not activated by user gesture, so not allowed!
+        await promise_rejects_dom(t, "NotAllowedError",
+          navigator.openTCPSocket(options));
+
+        await test_driver.bless("open socket");
+
+        // We have a gesture, but remotePort is omitted - so TypeError!
+        await promise_rejects_js(
+          t,
+          TypeError,
+          navigator.openTCPSocket(options)
+        );
+
+        // The activation has been consumed, so calling openTCPSocket() again
+        // would require a new gesture.
+        await promise_rejects_dom(t, "NotAllowedError",
+          navigator.openTCPSocket(options));
+      }, "Calling openTCPSocket consumes user activation");
+
+      promise_test(async t => {
+        // Not activated by user gesture, so not allowed!
+        await promise_rejects_dom(t, "NotAllowedError",
+          navigator.openUDPSocket(options));
+
+        await test_driver.bless("open socket");
+
+        // We have a gesture, but remotePort is omitted - so TypeError!
+        await promise_rejects_js(
+          t,
+          TypeError,
+          navigator.openUDPSocket(options)
+        );
+
+        // The activation has been consumed, so calling openUDPSocket() again
+        // would require a new gesture.
+        await promise_rejects_dom(t, "NotAllowedError",
+          navigator.openUDPSocket(options));
+      }, "Calling openUDPSocket consumes user activation");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/raw-sockets/open-securecontext.http.html b/tests/wpt/web-platform-tests/raw-sockets/open-securecontext.http.html
new file mode 100644
index 00000000000..371f13781a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/raw-sockets/open-securecontext.http.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Sockets test: Open from non-secure context</title>
+    <link rel="help" href="https://github.com/WICG/raw-sockets/blob/master/docs/explainer.md#security-considerations">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+        test(() => {
+          assert_false('openTCPSocket' in navigator, 'navigator has attribute \'openTCPSocket\'.');
+        }, 'navigator.openTCPSocket must be undefined in non-secure context');
+
+        test(() => {
+          assert_false('openUDPSocket' in navigator, 'navigator has attribute \'openUDPSocket\'.');
+        }, 'navigator.openUDPSocket must be undefined in non-secure context');
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/raw-sockets/open-without-user-gesture.https.html b/tests/wpt/web-platform-tests/raw-sockets/open-without-user-gesture.https.html
new file mode 100644
index 00000000000..ed9a9e0d2c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/raw-sockets/open-without-user-gesture.https.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Sockets test: open without user gesture fails</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      'use strict';
+
+      promise_test(t => {
+        return promise_rejects_dom(
+            t, 'NotAllowedError',
+            navigator.openTCPSocket({remotePort: 53}));
+      }, 'openTCPSocket without a user gesture');
+
+      promise_test(t => {
+        return promise_rejects_dom(
+            t, 'NotAllowedError',
+            navigator.openUDPSocket({remotePort: 53}));
+      }, 'openUDPSocket without a user gesture');
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/raw-sockets/remotePort-required.https.html b/tests/wpt/web-platform-tests/raw-sockets/remotePort-required.https.html
new file mode 100644
index 00000000000..6d738da845a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/raw-sockets/remotePort-required.https.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Sockets test: open without remotePort</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>
+  </head>
+  <body>
+    <script>
+      'use strict';
+
+      // Omits remotePort
+      const options = {
+        localAddress: "127.0.0.1",
+        localPort: 0,
+        remoteAddress: "127.0.0.1",
+      };
+
+      promise_test(async t => {
+        await test_driver.bless("open socket", () => {
+          return promise_rejects_js(t, TypeError, navigator.openTCPSocket());
+        });
+      }, "openTCPSocket with no arguments (same as empty dictionary)");
+
+      promise_test(async t => {
+        await test_driver.bless("open socket", () => {
+          return promise_rejects_js(t, TypeError, navigator.openUDPSocket({}));
+        });
+      }, "openUDPSocket with an empty dictionary");
+
+      promise_test(async t => {
+        await test_driver.bless("open socket", () => {
+          return promise_rejects_js(t, TypeError, navigator.openTCPSocket(undefined));
+        });
+      }, "openTCPSocket with a undefined argument (same as empty dictionary)");
+
+      promise_test(async t => {
+        await test_driver.bless("open socket", () => {
+          return promise_rejects_js(t, TypeError, navigator.openUDPSocket(null));
+        });
+      }, "openUDPSocket with a null argument (same as empty dictionary)");
+
+      promise_test(async t => {
+        await test_driver.bless("open socket", () => {
+          return promise_rejects_js(
+            t,
+            TypeError,
+            navigator.openTCPSocket(options)
+          );
+        });
+      }, "openTCPSocket with a dictionary omitting remotePort");
+
+      promise_test(async t => {
+        await test_driver.bless("open socket", () => {
+          return promise_rejects_js(
+            t,
+            TypeError,
+            navigator.openUDPSocket(options)
+          );
+        });
+      }, "openUDPSocket with a dictionary omitting remotePort");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_nested_dedicated_worker.worker.js b/tests/wpt/web-platform-tests/resource-timing/resource_nested_dedicated_worker.worker.js
index fc793075bba..2c9f5f95428 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resource_nested_dedicated_worker.worker.js
+++ b/tests/wpt/web-platform-tests/resource-timing/resource_nested_dedicated_worker.worker.js
@@ -1,6 +1,6 @@
 importScripts("/resources/testharness.js");
 
-async_test(async function() {
+async_test(function() {
   const worker = new Worker('resources/worker_with_images.js');
   worker.onmessage = this.step_func_done((event) => {
     const childNumEntries = event.data;
@@ -14,4 +14,4 @@ async_test(async function() {
     worker.terminate();
   });
 }, "Resource timing for nested dedicated workers");
-done();
\ No newline at end of file
+done();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/README.md b/tests/wpt/web-platform-tests/resources/chromium/README.md
index b53c6a8c423..ec953033f9b 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/README.md
+++ b/tests/wpt/web-platform-tests/resources/chromium/README.md
@@ -1,4 +1,7 @@
-This directory contains Chromium-specific test resources.
+This directory contains Chromium-specific test resources, including mocks for
+test-only APIs implemented with
+[MojoJS](https://chromium.googlesource.com/chromium/src/+/master/mojo/public/js/README.md).
 
-The files `mojo_bindings.js` and `*.mojom.js` are manually copied from the
-Chromium build process's generated files and should not be edited manually.
+Please do **not** copy `*.mojom.js` into this directory. Follow this doc if you
+want to add new MojoJS-backed mocks:
+https://chromium.googlesource.com/chromium/src/+/master/docs/testing/web_platform_tests.md#mojojs
diff --git a/tests/wpt/web-platform-tests/resources/chromium/image_capture-mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/image_capture-mojom.js.headers
deleted file mode 100644
index 6c61a34a4ec..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/image_capture-mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/image_capture.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/image_capture.mojom.js
deleted file mode 100644
index f145d7a3402..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/image_capture.mojom.js
+++ /dev/null
@@ -1,1403 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'media/capture/mojom/image_capture.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('media.mojom');
-
-
-  var MeteringMode = {};
-  MeteringMode.NONE = 0;
-  MeteringMode.MANUAL = MeteringMode.NONE + 1;
-  MeteringMode.SINGLE_SHOT = MeteringMode.MANUAL + 1;
-  MeteringMode.CONTINUOUS = MeteringMode.SINGLE_SHOT + 1;
-  MeteringMode.MIN_VALUE = 0,
-  MeteringMode.MAX_VALUE = 3,
-
-  MeteringMode.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    }
-    return false;
-  };
-
-  MeteringMode.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var RedEyeReduction = {};
-  RedEyeReduction.NEVER = 0;
-  RedEyeReduction.ALWAYS = RedEyeReduction.NEVER + 1;
-  RedEyeReduction.CONTROLLABLE = RedEyeReduction.ALWAYS + 1;
-  RedEyeReduction.MIN_VALUE = 0,
-  RedEyeReduction.MAX_VALUE = 2,
-
-  RedEyeReduction.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    }
-    return false;
-  };
-
-  RedEyeReduction.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var FillLightMode = {};
-  FillLightMode.OFF = 0;
-  FillLightMode.AUTO = FillLightMode.OFF + 1;
-  FillLightMode.FLASH = FillLightMode.AUTO + 1;
-  FillLightMode.MIN_VALUE = 0,
-  FillLightMode.MAX_VALUE = 2,
-
-  FillLightMode.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    }
-    return false;
-  };
-
-  FillLightMode.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-
-  function Range(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Range.prototype.initDefaults_ = function() {
-    this.max = 0;
-    this.min = 0;
-    this.current = 0;
-    this.step = 0;
-  };
-  Range.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Range.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 40}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  Range.encodedSize = codec.kStructHeaderSize + 32;
-
-  Range.decode = function(decoder) {
-    var packed;
-    var val = new Range();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.max = decoder.decodeStruct(codec.Double);
-    val.min = decoder.decodeStruct(codec.Double);
-    val.current = decoder.decodeStruct(codec.Double);
-    val.step = decoder.decodeStruct(codec.Double);
-    return val;
-  };
-
-  Range.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Range.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Double, val.max);
-    encoder.encodeStruct(codec.Double, val.min);
-    encoder.encodeStruct(codec.Double, val.current);
-    encoder.encodeStruct(codec.Double, val.step);
-  };
-  function PhotoState(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  PhotoState.prototype.initDefaults_ = function() {
-    this.supportedWhiteBalanceModes = null;
-    this.currentWhiteBalanceMode = 0;
-    this.currentExposureMode = 0;
-    this.supportedExposureModes = null;
-    this.supportedFocusModes = null;
-    this.currentFocusMode = 0;
-    this.supportsTorch = false;
-    this.torch = false;
-    this.pointsOfInterest = null;
-    this.exposureCompensation = null;
-    this.exposureTime = null;
-    this.colorTemperature = null;
-    this.iso = null;
-    this.brightness = null;
-    this.contrast = null;
-    this.saturation = null;
-    this.sharpness = null;
-    this.focusDistance = null;
-    this.pan = null;
-    this.tilt = null;
-    this.zoom = null;
-    this.redEyeReduction = 0;
-    this.height = null;
-    this.width = null;
-    this.fillLightMode = null;
-  };
-  PhotoState.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  PhotoState.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 184}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.supportedWhiteBalanceModes
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 4, new codec.Enum(MeteringMode), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.currentWhiteBalanceMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 8, MeteringMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.supportedExposureModes
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 16, 4, new codec.Enum(MeteringMode), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.currentExposureMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 12, MeteringMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.supportedFocusModes
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 24, 4, new codec.Enum(MeteringMode), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.currentFocusMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 32, MeteringMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.pointsOfInterest
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 40, 8, new codec.PointerTo(Point2D), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.exposureCompensation
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 48, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.exposureTime
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 56, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.colorTemperature
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 64, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.iso
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 72, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.brightness
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 80, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.contrast
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 88, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.saturation
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 96, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.sharpness
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 104, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.focusDistance
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 112, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.pan
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 120, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.tilt
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 128, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.zoom
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 136, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-    // validate PhotoState.redEyeReduction
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 144, RedEyeReduction);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.height
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 152, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.width
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 160, Range, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoState.fillLightMode
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 168, 4, new codec.Enum(FillLightMode), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  PhotoState.encodedSize = codec.kStructHeaderSize + 176;
-
-  PhotoState.decode = function(decoder) {
-    var packed;
-    var val = new PhotoState();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.supportedWhiteBalanceModes = decoder.decodeArrayPointer(new codec.Enum(MeteringMode));
-    val.currentWhiteBalanceMode = decoder.decodeStruct(codec.Int32);
-    val.currentExposureMode = decoder.decodeStruct(codec.Int32);
-    val.supportedExposureModes = decoder.decodeArrayPointer(new codec.Enum(MeteringMode));
-    val.supportedFocusModes = decoder.decodeArrayPointer(new codec.Enum(MeteringMode));
-    val.currentFocusMode = decoder.decodeStruct(codec.Int32);
-    packed = decoder.readUint8();
-    val.supportsTorch = (packed >> 0) & 1 ? true : false;
-    val.torch = (packed >> 1) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.pointsOfInterest = decoder.decodeArrayPointer(new codec.PointerTo(Point2D));
-    val.exposureCompensation = decoder.decodeStructPointer(Range);
-    val.exposureTime = decoder.decodeStructPointer(Range);
-    val.colorTemperature = decoder.decodeStructPointer(Range);
-    val.iso = decoder.decodeStructPointer(Range);
-    val.brightness = decoder.decodeStructPointer(Range);
-    val.contrast = decoder.decodeStructPointer(Range);
-    val.saturation = decoder.decodeStructPointer(Range);
-    val.sharpness = decoder.decodeStructPointer(Range);
-    val.focusDistance = decoder.decodeStructPointer(Range);
-    val.pan = decoder.decodeStructPointer(Range);
-    val.tilt = decoder.decodeStructPointer(Range);
-    val.zoom = decoder.decodeStructPointer(Range);
-    val.redEyeReduction = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.height = decoder.decodeStructPointer(Range);
-    val.width = decoder.decodeStructPointer(Range);
-    val.fillLightMode = decoder.decodeArrayPointer(new codec.Enum(FillLightMode));
-    return val;
-  };
-
-  PhotoState.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(PhotoState.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeArrayPointer(new codec.Enum(MeteringMode), val.supportedWhiteBalanceModes);
-    encoder.encodeStruct(codec.Int32, val.currentWhiteBalanceMode);
-    encoder.encodeStruct(codec.Int32, val.currentExposureMode);
-    encoder.encodeArrayPointer(new codec.Enum(MeteringMode), val.supportedExposureModes);
-    encoder.encodeArrayPointer(new codec.Enum(MeteringMode), val.supportedFocusModes);
-    encoder.encodeStruct(codec.Int32, val.currentFocusMode);
-    packed = 0;
-    packed |= (val.supportsTorch & 1) << 0
-    packed |= (val.torch & 1) << 1
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeArrayPointer(new codec.PointerTo(Point2D), val.pointsOfInterest);
-    encoder.encodeStructPointer(Range, val.exposureCompensation);
-    encoder.encodeStructPointer(Range, val.exposureTime);
-    encoder.encodeStructPointer(Range, val.colorTemperature);
-    encoder.encodeStructPointer(Range, val.iso);
-    encoder.encodeStructPointer(Range, val.brightness);
-    encoder.encodeStructPointer(Range, val.contrast);
-    encoder.encodeStructPointer(Range, val.saturation);
-    encoder.encodeStructPointer(Range, val.sharpness);
-    encoder.encodeStructPointer(Range, val.focusDistance);
-    encoder.encodeStructPointer(Range, val.pan);
-    encoder.encodeStructPointer(Range, val.tilt);
-    encoder.encodeStructPointer(Range, val.zoom);
-    encoder.encodeStruct(codec.Int32, val.redEyeReduction);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(Range, val.height);
-    encoder.encodeStructPointer(Range, val.width);
-    encoder.encodeArrayPointer(new codec.Enum(FillLightMode), val.fillLightMode);
-  };
-  function Point2D(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Point2D.prototype.initDefaults_ = function() {
-    this.x = 0;
-    this.y = 0;
-  };
-  Point2D.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Point2D.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  Point2D.encodedSize = codec.kStructHeaderSize + 16;
-
-  Point2D.decode = function(decoder) {
-    var packed;
-    var val = new Point2D();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.x = decoder.decodeStruct(codec.Double);
-    val.y = decoder.decodeStruct(codec.Double);
-    return val;
-  };
-
-  Point2D.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Point2D.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Double, val.x);
-    encoder.encodeStruct(codec.Double, val.y);
-  };
-  function PhotoSettings(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  PhotoSettings.prototype.initDefaults_ = function() {
-    this.hasWhiteBalanceMode = false;
-    this.hasExposureMode = false;
-    this.hasFocusMode = false;
-    this.hasExposureCompensation = false;
-    this.hasExposureTime = false;
-    this.hasColorTemperature = false;
-    this.hasIso = false;
-    this.hasBrightness = false;
-    this.hasContrast = false;
-    this.hasSaturation = false;
-    this.hasSharpness = false;
-    this.hasFocusDistance = false;
-    this.hasPan = false;
-    this.hasTilt = false;
-    this.hasZoom = false;
-    this.hasTorch = false;
-    this.torch = false;
-    this.hasFillLightMode = false;
-    this.hasWidth = false;
-    this.hasHeight = false;
-    this.hasRedEyeReduction = false;
-    this.redEyeReduction = false;
-    this.whiteBalanceMode = 0;
-    this.exposureMode = 0;
-    this.focusMode = 0;
-    this.pointsOfInterest = null;
-    this.exposureCompensation = 0;
-    this.exposureTime = 0;
-    this.colorTemperature = 0;
-    this.iso = 0;
-    this.brightness = 0;
-    this.contrast = 0;
-    this.saturation = 0;
-    this.sharpness = 0;
-    this.focusDistance = 0;
-    this.pan = 0;
-    this.tilt = 0;
-    this.zoom = 0;
-    this.fillLightMode = 0;
-    this.width = 0;
-    this.height = 0;
-  };
-  PhotoSettings.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  PhotoSettings.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 152}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate PhotoSettings.whiteBalanceMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 4, MeteringMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate PhotoSettings.exposureMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 8, MeteringMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate PhotoSettings.focusMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 12, MeteringMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate PhotoSettings.pointsOfInterest
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 16, 8, new codec.PointerTo(Point2D), false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    // validate PhotoSettings.fillLightMode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 120, FillLightMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  PhotoSettings.encodedSize = codec.kStructHeaderSize + 144;
-
-  PhotoSettings.decode = function(decoder) {
-    var packed;
-    var val = new PhotoSettings();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.hasWhiteBalanceMode = (packed >> 0) & 1 ? true : false;
-    val.hasExposureMode = (packed >> 1) & 1 ? true : false;
-    val.hasFocusMode = (packed >> 2) & 1 ? true : false;
-    val.hasExposureCompensation = (packed >> 3) & 1 ? true : false;
-    val.hasExposureTime = (packed >> 4) & 1 ? true : false;
-    val.hasColorTemperature = (packed >> 5) & 1 ? true : false;
-    val.hasIso = (packed >> 6) & 1 ? true : false;
-    val.hasBrightness = (packed >> 7) & 1 ? true : false;
-    packed = decoder.readUint8();
-    val.hasContrast = (packed >> 0) & 1 ? true : false;
-    val.hasSaturation = (packed >> 1) & 1 ? true : false;
-    val.hasSharpness = (packed >> 2) & 1 ? true : false;
-    val.hasFocusDistance = (packed >> 3) & 1 ? true : false;
-    val.hasPan = (packed >> 4) & 1 ? true : false;
-    val.hasTilt = (packed >> 5) & 1 ? true : false;
-    val.hasZoom = (packed >> 6) & 1 ? true : false;
-    val.hasTorch = (packed >> 7) & 1 ? true : false;
-    packed = decoder.readUint8();
-    val.torch = (packed >> 0) & 1 ? true : false;
-    val.hasFillLightMode = (packed >> 1) & 1 ? true : false;
-    val.hasWidth = (packed >> 2) & 1 ? true : false;
-    val.hasHeight = (packed >> 3) & 1 ? true : false;
-    val.hasRedEyeReduction = (packed >> 4) & 1 ? true : false;
-    val.redEyeReduction = (packed >> 5) & 1 ? true : false;
-    decoder.skip(1);
-    val.whiteBalanceMode = decoder.decodeStruct(codec.Int32);
-    val.exposureMode = decoder.decodeStruct(codec.Int32);
-    val.focusMode = decoder.decodeStruct(codec.Int32);
-    val.pointsOfInterest = decoder.decodeArrayPointer(new codec.PointerTo(Point2D));
-    val.exposureCompensation = decoder.decodeStruct(codec.Double);
-    val.exposureTime = decoder.decodeStruct(codec.Double);
-    val.colorTemperature = decoder.decodeStruct(codec.Double);
-    val.iso = decoder.decodeStruct(codec.Double);
-    val.brightness = decoder.decodeStruct(codec.Double);
-    val.contrast = decoder.decodeStruct(codec.Double);
-    val.saturation = decoder.decodeStruct(codec.Double);
-    val.sharpness = decoder.decodeStruct(codec.Double);
-    val.focusDistance = decoder.decodeStruct(codec.Double);
-    val.pan = decoder.decodeStruct(codec.Double);
-    val.tilt = decoder.decodeStruct(codec.Double);
-    val.zoom = decoder.decodeStruct(codec.Double);
-    val.fillLightMode = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.width = decoder.decodeStruct(codec.Double);
-    val.height = decoder.decodeStruct(codec.Double);
-    return val;
-  };
-
-  PhotoSettings.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(PhotoSettings.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.hasWhiteBalanceMode & 1) << 0
-    packed |= (val.hasExposureMode & 1) << 1
-    packed |= (val.hasFocusMode & 1) << 2
-    packed |= (val.hasExposureCompensation & 1) << 3
-    packed |= (val.hasExposureTime & 1) << 4
-    packed |= (val.hasColorTemperature & 1) << 5
-    packed |= (val.hasIso & 1) << 6
-    packed |= (val.hasBrightness & 1) << 7
-    encoder.writeUint8(packed);
-    packed = 0;
-    packed |= (val.hasContrast & 1) << 0
-    packed |= (val.hasSaturation & 1) << 1
-    packed |= (val.hasSharpness & 1) << 2
-    packed |= (val.hasFocusDistance & 1) << 3
-    packed |= (val.hasPan & 1) << 4
-    packed |= (val.hasTilt & 1) << 5
-    packed |= (val.hasZoom & 1) << 6
-    packed |= (val.hasTorch & 1) << 7
-    encoder.writeUint8(packed);
-    packed = 0;
-    packed |= (val.torch & 1) << 0
-    packed |= (val.hasFillLightMode & 1) << 1
-    packed |= (val.hasWidth & 1) << 2
-    packed |= (val.hasHeight & 1) << 3
-    packed |= (val.hasRedEyeReduction & 1) << 4
-    packed |= (val.redEyeReduction & 1) << 5
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Int32, val.whiteBalanceMode);
-    encoder.encodeStruct(codec.Int32, val.exposureMode);
-    encoder.encodeStruct(codec.Int32, val.focusMode);
-    encoder.encodeArrayPointer(new codec.PointerTo(Point2D), val.pointsOfInterest);
-    encoder.encodeStruct(codec.Double, val.exposureCompensation);
-    encoder.encodeStruct(codec.Double, val.exposureTime);
-    encoder.encodeStruct(codec.Double, val.colorTemperature);
-    encoder.encodeStruct(codec.Double, val.iso);
-    encoder.encodeStruct(codec.Double, val.brightness);
-    encoder.encodeStruct(codec.Double, val.contrast);
-    encoder.encodeStruct(codec.Double, val.saturation);
-    encoder.encodeStruct(codec.Double, val.sharpness);
-    encoder.encodeStruct(codec.Double, val.focusDistance);
-    encoder.encodeStruct(codec.Double, val.pan);
-    encoder.encodeStruct(codec.Double, val.tilt);
-    encoder.encodeStruct(codec.Double, val.zoom);
-    encoder.encodeStruct(codec.Int32, val.fillLightMode);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.Double, val.width);
-    encoder.encodeStruct(codec.Double, val.height);
-  };
-  function Blob(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Blob.prototype.initDefaults_ = function() {
-    this.mimeType = null;
-    this.data = null;
-  };
-  Blob.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Blob.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate Blob.mimeType
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate Blob.data
-    err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 8, 1, codec.Uint8, false, [0], 0);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Blob.encodedSize = codec.kStructHeaderSize + 16;
-
-  Blob.decode = function(decoder) {
-    var packed;
-    var val = new Blob();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.mimeType = decoder.decodeStruct(codec.String);
-    val.data = decoder.decodeArrayPointer(codec.Uint8);
-    return val;
-  };
-
-  Blob.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Blob.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.mimeType);
-    encoder.encodeArrayPointer(codec.Uint8, val.data);
-  };
-  function ImageCapture_GetPhotoState_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  ImageCapture_GetPhotoState_Params.prototype.initDefaults_ = function() {
-    this.sourceId = null;
-  };
-  ImageCapture_GetPhotoState_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  ImageCapture_GetPhotoState_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate ImageCapture_GetPhotoState_Params.sourceId
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  ImageCapture_GetPhotoState_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  ImageCapture_GetPhotoState_Params.decode = function(decoder) {
-    var packed;
-    var val = new ImageCapture_GetPhotoState_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.sourceId = decoder.decodeStruct(codec.String);
-    return val;
-  };
-
-  ImageCapture_GetPhotoState_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(ImageCapture_GetPhotoState_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.sourceId);
-  };
-  function ImageCapture_GetPhotoState_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  ImageCapture_GetPhotoState_ResponseParams.prototype.initDefaults_ = function() {
-    this.state = null;
-  };
-  ImageCapture_GetPhotoState_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  ImageCapture_GetPhotoState_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate ImageCapture_GetPhotoState_ResponseParams.state
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, PhotoState, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  ImageCapture_GetPhotoState_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  ImageCapture_GetPhotoState_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new ImageCapture_GetPhotoState_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.state = decoder.decodeStructPointer(PhotoState);
-    return val;
-  };
-
-  ImageCapture_GetPhotoState_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(ImageCapture_GetPhotoState_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(PhotoState, val.state);
-  };
-  function ImageCapture_SetOptions_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  ImageCapture_SetOptions_Params.prototype.initDefaults_ = function() {
-    this.sourceId = null;
-    this.settings = null;
-  };
-  ImageCapture_SetOptions_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  ImageCapture_SetOptions_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate ImageCapture_SetOptions_Params.sourceId
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate ImageCapture_SetOptions_Params.settings
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, PhotoSettings, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  ImageCapture_SetOptions_Params.encodedSize = codec.kStructHeaderSize + 16;
-
-  ImageCapture_SetOptions_Params.decode = function(decoder) {
-    var packed;
-    var val = new ImageCapture_SetOptions_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.sourceId = decoder.decodeStruct(codec.String);
-    val.settings = decoder.decodeStructPointer(PhotoSettings);
-    return val;
-  };
-
-  ImageCapture_SetOptions_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(ImageCapture_SetOptions_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.sourceId);
-    encoder.encodeStructPointer(PhotoSettings, val.settings);
-  };
-  function ImageCapture_SetOptions_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  ImageCapture_SetOptions_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  ImageCapture_SetOptions_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  ImageCapture_SetOptions_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  ImageCapture_SetOptions_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  ImageCapture_SetOptions_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new ImageCapture_SetOptions_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  ImageCapture_SetOptions_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(ImageCapture_SetOptions_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function ImageCapture_TakePhoto_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  ImageCapture_TakePhoto_Params.prototype.initDefaults_ = function() {
-    this.sourceId = null;
-  };
-  ImageCapture_TakePhoto_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  ImageCapture_TakePhoto_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate ImageCapture_TakePhoto_Params.sourceId
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  ImageCapture_TakePhoto_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  ImageCapture_TakePhoto_Params.decode = function(decoder) {
-    var packed;
-    var val = new ImageCapture_TakePhoto_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.sourceId = decoder.decodeStruct(codec.String);
-    return val;
-  };
-
-  ImageCapture_TakePhoto_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(ImageCapture_TakePhoto_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.sourceId);
-  };
-  function ImageCapture_TakePhoto_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  ImageCapture_TakePhoto_ResponseParams.prototype.initDefaults_ = function() {
-    this.blob = null;
-  };
-  ImageCapture_TakePhoto_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  ImageCapture_TakePhoto_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate ImageCapture_TakePhoto_ResponseParams.blob
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, Blob, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  ImageCapture_TakePhoto_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  ImageCapture_TakePhoto_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new ImageCapture_TakePhoto_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.blob = decoder.decodeStructPointer(Blob);
-    return val;
-  };
-
-  ImageCapture_TakePhoto_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(ImageCapture_TakePhoto_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(Blob, val.blob);
-  };
-  var kImageCapture_GetPhotoState_Name = 0;
-  var kImageCapture_SetOptions_Name = 1;
-  var kImageCapture_TakePhoto_Name = 2;
-
-  function ImageCapturePtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(ImageCapture,
-                                                   handleOrPtrInfo);
-  }
-
-  function ImageCaptureAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        ImageCapture, associatedInterfacePtrInfo);
-  }
-
-  ImageCaptureAssociatedPtr.prototype =
-      Object.create(ImageCapturePtr.prototype);
-  ImageCaptureAssociatedPtr.prototype.constructor =
-      ImageCaptureAssociatedPtr;
-
-  function ImageCaptureProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  ImageCapturePtr.prototype.getPhotoState = function() {
-    return ImageCaptureProxy.prototype.getPhotoState
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  ImageCaptureProxy.prototype.getPhotoState = function(sourceId) {
-    var params_ = new ImageCapture_GetPhotoState_Params();
-    params_.sourceId = sourceId;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kImageCapture_GetPhotoState_Name,
-          codec.align(ImageCapture_GetPhotoState_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(ImageCapture_GetPhotoState_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(ImageCapture_GetPhotoState_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  ImageCapturePtr.prototype.setOptions = function() {
-    return ImageCaptureProxy.prototype.setOptions
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  ImageCaptureProxy.prototype.setOptions = function(sourceId, settings) {
-    var params_ = new ImageCapture_SetOptions_Params();
-    params_.sourceId = sourceId;
-    params_.settings = settings;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kImageCapture_SetOptions_Name,
-          codec.align(ImageCapture_SetOptions_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(ImageCapture_SetOptions_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(ImageCapture_SetOptions_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  ImageCapturePtr.prototype.takePhoto = function() {
-    return ImageCaptureProxy.prototype.takePhoto
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  ImageCaptureProxy.prototype.takePhoto = function(sourceId) {
-    var params_ = new ImageCapture_TakePhoto_Params();
-    params_.sourceId = sourceId;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kImageCapture_TakePhoto_Name,
-          codec.align(ImageCapture_TakePhoto_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(ImageCapture_TakePhoto_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(ImageCapture_TakePhoto_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-
-  function ImageCaptureStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  ImageCaptureStub.prototype.getPhotoState = function(sourceId) {
-    return this.delegate_ && this.delegate_.getPhotoState && this.delegate_.getPhotoState(sourceId);
-  }
-  ImageCaptureStub.prototype.setOptions = function(sourceId, settings) {
-    return this.delegate_ && this.delegate_.setOptions && this.delegate_.setOptions(sourceId, settings);
-  }
-  ImageCaptureStub.prototype.takePhoto = function(sourceId) {
-    return this.delegate_ && this.delegate_.takePhoto && this.delegate_.takePhoto(sourceId);
-  }
-
-  ImageCaptureStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  ImageCaptureStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kImageCapture_GetPhotoState_Name:
-      var params = reader.decodeStruct(ImageCapture_GetPhotoState_Params);
-      this.getPhotoState(params.sourceId).then(function(response) {
-        var responseParams =
-            new ImageCapture_GetPhotoState_ResponseParams();
-        responseParams.state = response.state;
-        var builder = new codec.MessageV1Builder(
-            kImageCapture_GetPhotoState_Name,
-            codec.align(ImageCapture_GetPhotoState_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(ImageCapture_GetPhotoState_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kImageCapture_SetOptions_Name:
-      var params = reader.decodeStruct(ImageCapture_SetOptions_Params);
-      this.setOptions(params.sourceId, params.settings).then(function(response) {
-        var responseParams =
-            new ImageCapture_SetOptions_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kImageCapture_SetOptions_Name,
-            codec.align(ImageCapture_SetOptions_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(ImageCapture_SetOptions_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kImageCapture_TakePhoto_Name:
-      var params = reader.decodeStruct(ImageCapture_TakePhoto_Params);
-      this.takePhoto(params.sourceId).then(function(response) {
-        var responseParams =
-            new ImageCapture_TakePhoto_ResponseParams();
-        responseParams.blob = response.blob;
-        var builder = new codec.MessageV1Builder(
-            kImageCapture_TakePhoto_Name,
-            codec.align(ImageCapture_TakePhoto_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(ImageCapture_TakePhoto_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  function validateImageCaptureRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kImageCapture_GetPhotoState_Name:
-        if (message.expectsResponse())
-          paramsClass = ImageCapture_GetPhotoState_Params;
-      break;
-      case kImageCapture_SetOptions_Name:
-        if (message.expectsResponse())
-          paramsClass = ImageCapture_SetOptions_Params;
-      break;
-      case kImageCapture_TakePhoto_Name:
-        if (message.expectsResponse())
-          paramsClass = ImageCapture_TakePhoto_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateImageCaptureResponse(messageValidator) {
-   var message = messageValidator.message;
-   var paramsClass = null;
-   switch (message.getName()) {
-      case kImageCapture_GetPhotoState_Name:
-        if (message.isResponse())
-          paramsClass = ImageCapture_GetPhotoState_ResponseParams;
-        break;
-      case kImageCapture_SetOptions_Name:
-        if (message.isResponse())
-          paramsClass = ImageCapture_SetOptions_ResponseParams;
-        break;
-      case kImageCapture_TakePhoto_Name:
-        if (message.isResponse())
-          paramsClass = ImageCapture_TakePhoto_ResponseParams;
-        break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  var ImageCapture = {
-    name: 'media.mojom.ImageCapture',
-    kVersion: 0,
-    ptrClass: ImageCapturePtr,
-    proxyClass: ImageCaptureProxy,
-    stubClass: ImageCaptureStub,
-    validateRequest: validateImageCaptureRequest,
-    validateResponse: validateImageCaptureResponse,
-  };
-  ImageCaptureStub.prototype.validator = validateImageCaptureRequest;
-  ImageCaptureProxy.prototype.validator = validateImageCaptureResponse;
-  exports.MeteringMode = MeteringMode;
-  exports.RedEyeReduction = RedEyeReduction;
-  exports.FillLightMode = FillLightMode;
-  exports.Range = Range;
-  exports.PhotoState = PhotoState;
-  exports.Point2D = Point2D;
-  exports.PhotoSettings = PhotoSettings;
-  exports.Blob = Blob;
-  exports.ImageCapture = ImageCapture;
-  exports.ImageCapturePtr = ImageCapturePtr;
-  exports.ImageCaptureAssociatedPtr = ImageCaptureAssociatedPtr;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/idle-detection/mock.js b/tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js
similarity index 100%
rename from tests/wpt/web-platform-tests/idle-detection/mock.js
rename to tests/wpt/web-platform-tests/resources/chromium/mock-idle-detection.js
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js b/tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js
deleted file mode 100644
index 70f6cad5e5f..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js
+++ /dev/null
@@ -1,5146 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-if ((typeof mojo !== 'undefined') && mojo.bindingsLibraryInitialized) {
-  throw new Error('The Mojo bindings library has been initialized.');
-}
-
-var mojo = mojo || {};
-mojo.bindingsLibraryInitialized = true;
-
-mojo.internal = mojo.internal || {};
-
-mojo.config = mojo.config || {};
-if (typeof mojo.config.global === 'undefined') {
-  mojo.config.global = this;
-}
-
-if (typeof mojo.config.autoLoadMojomDeps === 'undefined') {
-  // Whether to automatically load mojom dependencies.
-  // For example, if foo.mojom imports bar.mojom, |autoLoadMojomDeps| set to
-  // true means that loading foo.mojom.js will insert a <script> tag to load
-  // bar.mojom.js, if it hasn't been loaded.
-  //
-  // The URL of bar.mojom.js is determined by the relative path of bar.mojom
-  // (relative to the position of foo.mojom at build time) and the URL of
-  // foo.mojom.js. For exmple, if at build time the two mojom files are
-  // located at:
-  //   a/b/c/foo.mojom
-  //   a/b/d/bar.mojom
-  // and the URL of foo.mojom.js is:
-  //   http://example.org/scripts/b/c/foo.mojom.js
-  // then the URL of bar.mojom.js will be:
-  //   http://example.org/scripts/b/d/bar.mojom.js
-  //
-  // If you would like bar.mojom.js to live at a different location, you need
-  // to turn off |autoLoadMojomDeps| before loading foo.mojom.js, and manually
-  // load bar.mojom.js yourself. Similarly, you need to turn off the option if
-  // you merge bar.mojom.js and foo.mojom.js into a single file.
-  //
-  // Performance tip: Avoid loading the same mojom.js file multiple times.
-  // Assume that |autoLoadMojomDeps| is set to true,
-  //
-  // <!--
-  // (This comment tag is necessary on IOS to avoid interpreting the closing
-  // script tags in the example.)
-  //
-  // No duplicate loading; recommended:
-  // <script src="http://example.org/scripts/b/c/foo.mojom.js"></script>
-  //
-  // No duplicate loading, although unnecessary:
-  // <script src="http://example.org/scripts/b/d/bar.mojom.js"></script>
-  // <script src="http://example.org/scripts/b/c/foo.mojom.js"></script>
-  //
-  // Load bar.mojom.js twice; should be avoided:
-  // <script src="http://example.org/scripts/b/c/foo.mojom.js"></script>
-  // <script src="http://example.org/scripts/b/d/bar.mojom.js"></script>
-  //
-  // -->
-  mojo.config.autoLoadMojomDeps = true;
-}
-
-(function() {
-  var internal = mojo.internal;
-  var config = mojo.config;
-
-  var LoadState = {
-    PENDING_LOAD: 1,
-    LOADED: 2
-  };
-
-  var mojomRegistry = new Map();
-
-  function exposeNamespace(namespace) {
-    var current = config.global;
-    var parts = namespace.split('.');
-
-    for (var part; parts.length && (part = parts.shift());) {
-      if (!current[part]) {
-        current[part] = {};
-      }
-      current = current[part];
-    }
-
-    return current;
-  }
-
-  function isMojomPendingLoad(id) {
-    return mojomRegistry.get(id) === LoadState.PENDING_LOAD;
-  }
-
-  function isMojomLoaded(id) {
-    return mojomRegistry.get(id) === LoadState.LOADED;
-  }
-
-  function markMojomPendingLoad(id) {
-    if (isMojomLoaded(id)) {
-      throw new Error('The following mojom file has been loaded: ' + id);
-    }
-
-    mojomRegistry.set(id, LoadState.PENDING_LOAD);
-  }
-
-  function markMojomLoaded(id) {
-    mojomRegistry.set(id, LoadState.LOADED);
-  }
-
-  function loadMojomIfNecessary(id, relativePath) {
-    if (mojomRegistry.has(id)) {
-      return;
-    }
-
-    if (config.global.document === undefined) {
-      throw new Error(
-          'Mojom dependency autoloading is not implemented in workers. ' +
-          'Please see config variable mojo.config.autoLoadMojomDeps for more ' +
-          'details.');
-    }
-
-    markMojomPendingLoad(id);
-    var url = new URL(relativePath, document.currentScript.src).href;
-    config.global.document.write('<script type="text/javascript" src="' +
-                                 url + '"><' + '/script>');
-  }
-
-  internal.exposeNamespace = exposeNamespace;
-  internal.isMojomPendingLoad = isMojomPendingLoad;
-  internal.isMojomLoaded = isMojomLoaded;
-  internal.markMojomPendingLoad = markMojomPendingLoad;
-  internal.markMojomLoaded = markMojomLoaded;
-  internal.loadMojomIfNecessary = loadMojomIfNecessary;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  // ---------------------------------------------------------------------------
-
-  // |output| could be an interface pointer, InterfacePtrInfo or
-  // AssociatedInterfacePtrInfo.
-  function makeRequest(output) {
-    if (output instanceof mojo.AssociatedInterfacePtrInfo) {
-      var {handle0, handle1} = internal.createPairPendingAssociation();
-      output.interfaceEndpointHandle = handle0;
-      output.version = 0;
-
-      return new mojo.AssociatedInterfaceRequest(handle1);
-    }
-
-    if (output instanceof mojo.InterfacePtrInfo) {
-      var pipe = Mojo.createMessagePipe();
-      output.handle = pipe.handle0;
-      output.version = 0;
-
-      return new mojo.InterfaceRequest(pipe.handle1);
-    }
-
-    var pipe = Mojo.createMessagePipe();
-    output.ptr.bind(new mojo.InterfacePtrInfo(pipe.handle0, 0));
-    return new mojo.InterfaceRequest(pipe.handle1);
-  }
-
-  // ---------------------------------------------------------------------------
-
-  // Operations used to setup/configure an interface pointer. Exposed as the
-  // |ptr| field of generated interface pointer classes.
-  // |ptrInfoOrHandle| could be omitted and passed into bind() later.
-  function InterfacePtrController(interfaceType, ptrInfoOrHandle) {
-    this.version = 0;
-
-    this.interfaceType_ = interfaceType;
-    this.router_ = null;
-    this.interfaceEndpointClient_ = null;
-    this.proxy_ = null;
-
-    // |router_| and |interfaceEndpointClient_| are lazily initialized.
-    // |handle_| is valid between bind() and
-    // the initialization of |router_| and |interfaceEndpointClient_|.
-    this.handle_ = null;
-
-    if (ptrInfoOrHandle)
-      this.bind(ptrInfoOrHandle);
-  }
-
-  InterfacePtrController.prototype.bind = function(ptrInfoOrHandle) {
-    this.reset();
-
-    if (ptrInfoOrHandle instanceof mojo.InterfacePtrInfo) {
-      this.version = ptrInfoOrHandle.version;
-      this.handle_ = ptrInfoOrHandle.handle;
-    } else {
-      this.handle_ = ptrInfoOrHandle;
-    }
-  };
-
-  InterfacePtrController.prototype.isBound = function() {
-    return this.interfaceEndpointClient_ !== null || this.handle_ !== null;
-  };
-
-  // Although users could just discard the object, reset() closes the pipe
-  // immediately.
-  InterfacePtrController.prototype.reset = function() {
-    this.version = 0;
-    if (this.interfaceEndpointClient_) {
-      this.interfaceEndpointClient_.close();
-      this.interfaceEndpointClient_ = null;
-    }
-    if (this.router_) {
-      this.router_.close();
-      this.router_ = null;
-
-      this.proxy_ = null;
-    }
-    if (this.handle_) {
-      this.handle_.close();
-      this.handle_ = null;
-    }
-  };
-
-  InterfacePtrController.prototype.resetWithReason = function(reason) {
-    if (this.isBound()) {
-      this.configureProxyIfNecessary_();
-      this.interfaceEndpointClient_.close(reason);
-      this.interfaceEndpointClient_ = null;
-    }
-    this.reset();
-  };
-
-  InterfacePtrController.prototype.setConnectionErrorHandler = function(
-      callback) {
-    if (!this.isBound())
-      throw new Error("Cannot set connection error handler if not bound.");
-
-    this.configureProxyIfNecessary_();
-    this.interfaceEndpointClient_.setConnectionErrorHandler(callback);
-  };
-
-  InterfacePtrController.prototype.passInterface = function() {
-    var result;
-    if (this.router_) {
-      // TODO(yzshen): Fix Router interface to support extracting handle.
-      result = new mojo.InterfacePtrInfo(
-          this.router_.connector_.handle_, this.version);
-      this.router_.connector_.handle_ = null;
-    } else {
-      // This also handles the case when this object is not bound.
-      result = new mojo.InterfacePtrInfo(this.handle_, this.version);
-      this.handle_ = null;
-    }
-
-    this.reset();
-    return result;
-  };
-
-  InterfacePtrController.prototype.getProxy = function() {
-    this.configureProxyIfNecessary_();
-    return this.proxy_;
-  };
-
-  InterfacePtrController.prototype.configureProxyIfNecessary_ = function() {
-    if (!this.handle_)
-      return;
-
-    this.router_ = new internal.Router(this.handle_, true);
-    this.handle_ = null;
-
-    this.interfaceEndpointClient_ = new internal.InterfaceEndpointClient(
-        this.router_.createLocalEndpointHandle(internal.kMasterInterfaceId));
-
-    this.interfaceEndpointClient_ .setPayloadValidators([
-        this.interfaceType_.validateResponse]);
-    this.proxy_ = new this.interfaceType_.proxyClass(
-        this.interfaceEndpointClient_);
-  };
-
-  InterfacePtrController.prototype.queryVersion = function() {
-    function onQueryVersion(version) {
-      this.version = version;
-      return version;
-    }
-
-    this.configureProxyIfNecessary_();
-    return this.interfaceEndpointClient_.queryVersion().then(
-      onQueryVersion.bind(this));
-  };
-
-  InterfacePtrController.prototype.requireVersion = function(version) {
-    this.configureProxyIfNecessary_();
-
-    if (this.version >= version) {
-      return;
-    }
-    this.version = version;
-    this.interfaceEndpointClient_.requireVersion(version);
-  };
-
-  // ---------------------------------------------------------------------------
-
-  // |request| could be omitted and passed into bind() later.
-  //
-  // Example:
-  //
-  //    // FooImpl implements mojom.Foo.
-  //    function FooImpl() { ... }
-  //    FooImpl.prototype.fooMethod1 = function() { ... }
-  //    FooImpl.prototype.fooMethod2 = function() { ... }
-  //
-  //    var fooPtr = new mojom.FooPtr();
-  //    var request = makeRequest(fooPtr);
-  //    var binding = new Binding(mojom.Foo, new FooImpl(), request);
-  //    fooPtr.fooMethod1();
-  function Binding(interfaceType, impl, requestOrHandle) {
-    this.interfaceType_ = interfaceType;
-    this.impl_ = impl;
-    this.router_ = null;
-    this.interfaceEndpointClient_ = null;
-    this.stub_ = null;
-
-    if (requestOrHandle)
-      this.bind(requestOrHandle);
-  }
-
-  Binding.prototype.isBound = function() {
-    return this.router_ !== null;
-  };
-
-  Binding.prototype.createInterfacePtrAndBind = function() {
-    var ptr = new this.interfaceType_.ptrClass();
-    // TODO(yzshen): Set the version of the interface pointer.
-    this.bind(makeRequest(ptr));
-    return ptr;
-  };
-
-  Binding.prototype.bind = function(requestOrHandle) {
-    this.close();
-
-    var handle = requestOrHandle instanceof mojo.InterfaceRequest ?
-        requestOrHandle.handle : requestOrHandle;
-    if (!(handle instanceof MojoHandle))
-      return;
-
-    this.router_ = new internal.Router(handle);
-
-    this.stub_ = new this.interfaceType_.stubClass(this.impl_);
-    this.interfaceEndpointClient_ = new internal.InterfaceEndpointClient(
-        this.router_.createLocalEndpointHandle(internal.kMasterInterfaceId),
-        this.stub_, this.interfaceType_.kVersion);
-
-    this.interfaceEndpointClient_ .setPayloadValidators([
-        this.interfaceType_.validateRequest]);
-  };
-
-  Binding.prototype.close = function() {
-    if (!this.isBound())
-      return;
-
-    if (this.interfaceEndpointClient_) {
-      this.interfaceEndpointClient_.close();
-      this.interfaceEndpointClient_ = null;
-    }
-
-    this.router_.close();
-    this.router_ = null;
-    this.stub_ = null;
-  };
-
-  Binding.prototype.closeWithReason = function(reason) {
-    if (this.interfaceEndpointClient_) {
-      this.interfaceEndpointClient_.close(reason);
-      this.interfaceEndpointClient_ = null;
-    }
-    this.close();
-  };
-
-  Binding.prototype.setConnectionErrorHandler = function(callback) {
-    if (!this.isBound()) {
-      throw new Error("Cannot set connection error handler if not bound.");
-    }
-    this.interfaceEndpointClient_.setConnectionErrorHandler(callback);
-  };
-
-  Binding.prototype.unbind = function() {
-    if (!this.isBound())
-      return new mojo.InterfaceRequest(null);
-
-    var result = new mojo.InterfaceRequest(this.router_.connector_.handle_);
-    this.router_.connector_.handle_ = null;
-    this.close();
-    return result;
-  };
-
-  // ---------------------------------------------------------------------------
-
-  function BindingSetEntry(bindingSet, interfaceType, bindingType, impl,
-      requestOrHandle, bindingId) {
-    this.bindingSet_ = bindingSet;
-    this.bindingId_ = bindingId;
-    this.binding_ = new bindingType(interfaceType, impl,
-        requestOrHandle);
-
-    this.binding_.setConnectionErrorHandler(function(reason) {
-      this.bindingSet_.onConnectionError(bindingId, reason);
-    }.bind(this));
-  }
-
-  BindingSetEntry.prototype.close = function() {
-    this.binding_.close();
-  };
-
-  function BindingSet(interfaceType) {
-    this.interfaceType_ = interfaceType;
-    this.nextBindingId_ = 0;
-    this.bindings_ = new Map();
-    this.errorHandler_ = null;
-    this.bindingType_ = Binding;
-  }
-
-  BindingSet.prototype.isEmpty = function() {
-    return this.bindings_.size == 0;
-  };
-
-  BindingSet.prototype.addBinding = function(impl, requestOrHandle) {
-    this.bindings_.set(
-        this.nextBindingId_,
-        new BindingSetEntry(this, this.interfaceType_, this.bindingType_, impl,
-            requestOrHandle, this.nextBindingId_));
-    ++this.nextBindingId_;
-  };
-
-  BindingSet.prototype.closeAllBindings = function() {
-    for (var entry of this.bindings_.values())
-      entry.close();
-    this.bindings_.clear();
-  };
-
-  BindingSet.prototype.setConnectionErrorHandler = function(callback) {
-    this.errorHandler_ = callback;
-  };
-
-  BindingSet.prototype.onConnectionError = function(bindingId, reason) {
-    this.bindings_.delete(bindingId);
-
-    if (this.errorHandler_)
-      this.errorHandler_(reason);
-  };
-
-  // ---------------------------------------------------------------------------
-
-  // Operations used to setup/configure an associated interface pointer.
-  // Exposed as |ptr| field of generated associated interface pointer classes.
-  // |associatedPtrInfo| could be omitted and passed into bind() later.
-  //
-  // Example:
-  //    // IntegerSenderImpl implements mojom.IntegerSender
-  //    function IntegerSenderImpl() { ... }
-  //    IntegerSenderImpl.prototype.echo = function() { ... }
-  //
-  //    // IntegerSenderConnectionImpl implements mojom.IntegerSenderConnection
-  //    function IntegerSenderConnectionImpl() {
-  //      this.senderBinding_ = null;
-  //    }
-  //    IntegerSenderConnectionImpl.prototype.getSender = function(
-  //        associatedRequest) {
-  //      this.senderBinding_ = new AssociatedBinding(mojom.IntegerSender,
-  //          new IntegerSenderImpl(),
-  //          associatedRequest);
-  //    }
-  //
-  //    var integerSenderConnection = new mojom.IntegerSenderConnectionPtr();
-  //    var integerSenderConnectionBinding = new Binding(
-  //        mojom.IntegerSenderConnection,
-  //        new IntegerSenderConnectionImpl(),
-  //        mojo.makeRequest(integerSenderConnection));
-  //
-  //    // A locally-created associated interface pointer can only be used to
-  //    // make calls when the corresponding associated request is sent over
-  //    // another interface (either the master interface or another
-  //    // associated interface).
-  //    var associatedInterfacePtrInfo = new AssociatedInterfacePtrInfo();
-  //    var associatedRequest = makeRequest(interfacePtrInfo);
-  //
-  //    integerSenderConnection.getSender(associatedRequest);
-  //
-  //    // Create an associated interface and bind the associated handle.
-  //    var integerSender = new mojom.AssociatedIntegerSenderPtr();
-  //    integerSender.ptr.bind(associatedInterfacePtrInfo);
-  //    integerSender.echo();
-
-  function AssociatedInterfacePtrController(interfaceType, associatedPtrInfo) {
-    this.version = 0;
-
-    this.interfaceType_ = interfaceType;
-    this.interfaceEndpointClient_ = null;
-    this.proxy_ = null;
-
-    if (associatedPtrInfo) {
-      this.bind(associatedPtrInfo);
-    }
-  }
-
-  AssociatedInterfacePtrController.prototype.bind = function(
-      associatedPtrInfo) {
-    this.reset();
-    this.version = associatedPtrInfo.version;
-
-    this.interfaceEndpointClient_ = new internal.InterfaceEndpointClient(
-        associatedPtrInfo.interfaceEndpointHandle);
-
-    this.interfaceEndpointClient_ .setPayloadValidators([
-        this.interfaceType_.validateResponse]);
-    this.proxy_ = new this.interfaceType_.proxyClass(
-        this.interfaceEndpointClient_);
-  };
-
-  AssociatedInterfacePtrController.prototype.isBound = function() {
-    return this.interfaceEndpointClient_ !== null;
-  };
-
-  AssociatedInterfacePtrController.prototype.reset = function() {
-    this.version = 0;
-    if (this.interfaceEndpointClient_) {
-      this.interfaceEndpointClient_.close();
-      this.interfaceEndpointClient_ = null;
-    }
-    if (this.proxy_) {
-      this.proxy_ = null;
-    }
-  };
-
-  AssociatedInterfacePtrController.prototype.resetWithReason = function(
-      reason) {
-    if (this.isBound()) {
-      this.interfaceEndpointClient_.close(reason);
-      this.interfaceEndpointClient_ = null;
-    }
-    this.reset();
-  };
-
-  // Indicates whether an error has been encountered. If true, method calls
-  // on this interface will be dropped (and may already have been dropped).
-  AssociatedInterfacePtrController.prototype.getEncounteredError = function() {
-    return this.interfaceEndpointClient_ ?
-        this.interfaceEndpointClient_.getEncounteredError() : false;
-  };
-
-  AssociatedInterfacePtrController.prototype.setConnectionErrorHandler =
-      function(callback) {
-    if (!this.isBound()) {
-      throw new Error("Cannot set connection error handler if not bound.");
-    }
-
-    this.interfaceEndpointClient_.setConnectionErrorHandler(callback);
-  };
-
-  AssociatedInterfacePtrController.prototype.passInterface = function() {
-    if (!this.isBound()) {
-      return new mojo.AssociatedInterfacePtrInfo(null);
-    }
-
-    var result = new mojo.AssociatedInterfacePtrInfo(
-        this.interfaceEndpointClient_.passHandle(), this.version);
-    this.reset();
-    return result;
-  };
-
-  AssociatedInterfacePtrController.prototype.getProxy = function() {
-    return this.proxy_;
-  };
-
-  AssociatedInterfacePtrController.prototype.queryVersion = function() {
-    function onQueryVersion(version) {
-      this.version = version;
-      return version;
-    }
-
-    return this.interfaceEndpointClient_.queryVersion().then(
-      onQueryVersion.bind(this));
-  };
-
-  AssociatedInterfacePtrController.prototype.requireVersion = function(
-      version) {
-    if (this.version >= version) {
-      return;
-    }
-    this.version = version;
-    this.interfaceEndpointClient_.requireVersion(version);
-  };
-
-  // ---------------------------------------------------------------------------
-
-  // |associatedInterfaceRequest| could be omitted and passed into bind()
-  // later.
-  function AssociatedBinding(interfaceType, impl, associatedInterfaceRequest) {
-    this.interfaceType_ = interfaceType;
-    this.impl_ = impl;
-    this.interfaceEndpointClient_ = null;
-    this.stub_ = null;
-
-    if (associatedInterfaceRequest) {
-      this.bind(associatedInterfaceRequest);
-    }
-  }
-
-  AssociatedBinding.prototype.isBound = function() {
-    return this.interfaceEndpointClient_ !== null;
-  };
-
-  AssociatedBinding.prototype.bind = function(associatedInterfaceRequest) {
-    this.close();
-
-    this.stub_ = new this.interfaceType_.stubClass(this.impl_);
-    this.interfaceEndpointClient_ = new internal.InterfaceEndpointClient(
-        associatedInterfaceRequest.interfaceEndpointHandle, this.stub_,
-        this.interfaceType_.kVersion);
-
-    this.interfaceEndpointClient_ .setPayloadValidators([
-        this.interfaceType_.validateRequest]);
-  };
-
-
-  AssociatedBinding.prototype.close = function() {
-    if (!this.isBound()) {
-      return;
-    }
-
-    if (this.interfaceEndpointClient_) {
-      this.interfaceEndpointClient_.close();
-      this.interfaceEndpointClient_ = null;
-    }
-
-    this.stub_ = null;
-  };
-
-  AssociatedBinding.prototype.closeWithReason = function(reason) {
-    if (this.interfaceEndpointClient_) {
-      this.interfaceEndpointClient_.close(reason);
-      this.interfaceEndpointClient_ = null;
-    }
-    this.close();
-  };
-
-  AssociatedBinding.prototype.setConnectionErrorHandler = function(callback) {
-    if (!this.isBound()) {
-      throw new Error("Cannot set connection error handler if not bound.");
-    }
-    this.interfaceEndpointClient_.setConnectionErrorHandler(callback);
-  };
-
-  AssociatedBinding.prototype.unbind = function() {
-    if (!this.isBound()) {
-      return new mojo.AssociatedInterfaceRequest(null);
-    }
-
-    var result = new mojo.AssociatedInterfaceRequest(
-        this.interfaceEndpointClient_.passHandle());
-    this.close();
-    return result;
-  };
-
-  // ---------------------------------------------------------------------------
-
-  function AssociatedBindingSet(interfaceType) {
-    mojo.BindingSet.call(this, interfaceType);
-    this.bindingType_ = AssociatedBinding;
-  }
-
-  AssociatedBindingSet.prototype = Object.create(BindingSet.prototype);
-  AssociatedBindingSet.prototype.constructor = AssociatedBindingSet;
-
-  mojo.makeRequest = makeRequest;
-  mojo.AssociatedInterfacePtrController = AssociatedInterfacePtrController;
-  mojo.AssociatedBinding = AssociatedBinding;
-  mojo.AssociatedBindingSet = AssociatedBindingSet;
-  mojo.Binding = Binding;
-  mojo.BindingSet = BindingSet;
-  mojo.InterfacePtrController = InterfacePtrController;
-})();
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  // Constants ----------------------------------------------------------------
-  var kInterfaceIdNamespaceMask = 0x80000000;
-  var kMasterInterfaceId = 0x00000000;
-  var kInvalidInterfaceId = 0xFFFFFFFF;
-
-  // ---------------------------------------------------------------------------
-
-  function InterfacePtrInfo(handle, version) {
-    this.handle = handle;
-    this.version = version;
-  }
-
-  InterfacePtrInfo.prototype.isValid = function() {
-    return this.handle instanceof MojoHandle;
-  };
-
-  InterfacePtrInfo.prototype.close = function() {
-    if (!this.isValid())
-      return;
-
-    this.handle.close();
-    this.handle = null;
-    this.version = 0;
-  };
-
-  function AssociatedInterfacePtrInfo(interfaceEndpointHandle, version) {
-    this.interfaceEndpointHandle = interfaceEndpointHandle;
-    this.version = version;
-  }
-
-  AssociatedInterfacePtrInfo.prototype.isValid = function() {
-    return this.interfaceEndpointHandle.isValid();
-  };
-
-  // ---------------------------------------------------------------------------
-
-  function InterfaceRequest(handle) {
-    this.handle = handle;
-  }
-
-  InterfaceRequest.prototype.isValid = function() {
-    return this.handle instanceof MojoHandle;
-  };
-
-  InterfaceRequest.prototype.close = function() {
-    if (!this.isValid())
-      return;
-
-    this.handle.close();
-    this.handle = null;
-  };
-
-  function AssociatedInterfaceRequest(interfaceEndpointHandle) {
-    this.interfaceEndpointHandle = interfaceEndpointHandle;
-  }
-
-  AssociatedInterfaceRequest.prototype.isValid = function() {
-    return this.interfaceEndpointHandle.isValid();
-  };
-
-  AssociatedInterfaceRequest.prototype.resetWithReason = function(reason) {
-    this.interfaceEndpointHandle.reset(reason);
-  };
-
-  function isMasterInterfaceId(interfaceId) {
-    return interfaceId === kMasterInterfaceId;
-  }
-
-  function isValidInterfaceId(interfaceId) {
-    return interfaceId !== kInvalidInterfaceId;
-  }
-
-  function hasInterfaceIdNamespaceBitSet(interfaceId) {
-    if (interfaceId >= 2 * kInterfaceIdNamespaceMask) {
-      throw new Error("Interface ID should be a 32-bit unsigned integer.");
-    }
-    return interfaceId >= kInterfaceIdNamespaceMask;
-  }
-
-  mojo.InterfacePtrInfo = InterfacePtrInfo;
-  mojo.InterfaceRequest = InterfaceRequest;
-  mojo.AssociatedInterfacePtrInfo = AssociatedInterfacePtrInfo;
-  mojo.AssociatedInterfaceRequest = AssociatedInterfaceRequest;
-  internal.isMasterInterfaceId = isMasterInterfaceId;
-  internal.isValidInterfaceId = isValidInterfaceId;
-  internal.hasInterfaceIdNamespaceBitSet = hasInterfaceIdNamespaceBitSet;
-  internal.kInvalidInterfaceId = kInvalidInterfaceId;
-  internal.kMasterInterfaceId = kMasterInterfaceId;
-  internal.kInterfaceIdNamespaceMask = kInterfaceIdNamespaceMask;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  var kHostIsLittleEndian = (function () {
-    var endianArrayBuffer = new ArrayBuffer(2);
-    var endianUint8Array = new Uint8Array(endianArrayBuffer);
-    var endianUint16Array = new Uint16Array(endianArrayBuffer);
-    endianUint16Array[0] = 1;
-    return endianUint8Array[0] == 1;
-  })();
-
-  var kHighWordMultiplier = 0x100000000;
-
-  function Buffer(sizeOrArrayBuffer) {
-    if (sizeOrArrayBuffer instanceof ArrayBuffer)
-      this.arrayBuffer = sizeOrArrayBuffer;
-    else
-      this.arrayBuffer = new ArrayBuffer(sizeOrArrayBuffer);
-
-    this.dataView = new DataView(this.arrayBuffer);
-    this.next = 0;
-  }
-
-  Object.defineProperty(Buffer.prototype, "byteLength", {
-    get: function() { return this.arrayBuffer.byteLength; }
-  });
-
-  Buffer.prototype.alloc = function(size) {
-    var pointer = this.next;
-    this.next += size;
-    if (this.next > this.byteLength) {
-      var newSize = (1.5 * (this.byteLength + size)) | 0;
-      this.grow(newSize);
-    }
-    return pointer;
-  };
-
-  function copyArrayBuffer(dstArrayBuffer, srcArrayBuffer) {
-    (new Uint8Array(dstArrayBuffer)).set(new Uint8Array(srcArrayBuffer));
-  }
-
-  Buffer.prototype.grow = function(size) {
-    var newArrayBuffer = new ArrayBuffer(size);
-    copyArrayBuffer(newArrayBuffer, this.arrayBuffer);
-    this.arrayBuffer = newArrayBuffer;
-    this.dataView = new DataView(this.arrayBuffer);
-  };
-
-  Buffer.prototype.trim = function() {
-    this.arrayBuffer = this.arrayBuffer.slice(0, this.next);
-    this.dataView = new DataView(this.arrayBuffer);
-  };
-
-  Buffer.prototype.getUint8 = function(offset) {
-    return this.dataView.getUint8(offset);
-  }
-  Buffer.prototype.getUint16 = function(offset) {
-    return this.dataView.getUint16(offset, kHostIsLittleEndian);
-  }
-  Buffer.prototype.getUint32 = function(offset) {
-    return this.dataView.getUint32(offset, kHostIsLittleEndian);
-  }
-  Buffer.prototype.getUint64 = function(offset) {
-    var lo, hi;
-    if (kHostIsLittleEndian) {
-      lo = this.dataView.getUint32(offset, kHostIsLittleEndian);
-      hi = this.dataView.getUint32(offset + 4, kHostIsLittleEndian);
-    } else {
-      hi = this.dataView.getUint32(offset, kHostIsLittleEndian);
-      lo = this.dataView.getUint32(offset + 4, kHostIsLittleEndian);
-    }
-    return lo + hi * kHighWordMultiplier;
-  }
-
-  Buffer.prototype.getInt8 = function(offset) {
-    return this.dataView.getInt8(offset);
-  }
-  Buffer.prototype.getInt16 = function(offset) {
-    return this.dataView.getInt16(offset, kHostIsLittleEndian);
-  }
-  Buffer.prototype.getInt32 = function(offset) {
-    return this.dataView.getInt32(offset, kHostIsLittleEndian);
-  }
-  Buffer.prototype.getInt64 = function(offset) {
-    var lo, hi;
-    if (kHostIsLittleEndian) {
-      lo = this.dataView.getUint32(offset, kHostIsLittleEndian);
-      hi = this.dataView.getInt32(offset + 4, kHostIsLittleEndian);
-    } else {
-      hi = this.dataView.getInt32(offset, kHostIsLittleEndian);
-      lo = this.dataView.getUint32(offset + 4, kHostIsLittleEndian);
-    }
-    return lo + hi * kHighWordMultiplier;
-  }
-
-  Buffer.prototype.getFloat32 = function(offset) {
-    return this.dataView.getFloat32(offset, kHostIsLittleEndian);
-  }
-  Buffer.prototype.getFloat64 = function(offset) {
-    return this.dataView.getFloat64(offset, kHostIsLittleEndian);
-  }
-
-  Buffer.prototype.setUint8 = function(offset, value) {
-    this.dataView.setUint8(offset, value);
-  }
-  Buffer.prototype.setUint16 = function(offset, value) {
-    this.dataView.setUint16(offset, value, kHostIsLittleEndian);
-  }
-  Buffer.prototype.setUint32 = function(offset, value) {
-    this.dataView.setUint32(offset, value, kHostIsLittleEndian);
-  }
-  Buffer.prototype.setUint64 = function(offset, value) {
-    var hi = (value / kHighWordMultiplier) | 0;
-    if (kHostIsLittleEndian) {
-      this.dataView.setInt32(offset, value, kHostIsLittleEndian);
-      this.dataView.setInt32(offset + 4, hi, kHostIsLittleEndian);
-    } else {
-      this.dataView.setInt32(offset, hi, kHostIsLittleEndian);
-      this.dataView.setInt32(offset + 4, value, kHostIsLittleEndian);
-    }
-  }
-
-  Buffer.prototype.setInt8 = function(offset, value) {
-    this.dataView.setInt8(offset, value);
-  }
-  Buffer.prototype.setInt16 = function(offset, value) {
-    this.dataView.setInt16(offset, value, kHostIsLittleEndian);
-  }
-  Buffer.prototype.setInt32 = function(offset, value) {
-    this.dataView.setInt32(offset, value, kHostIsLittleEndian);
-  }
-  Buffer.prototype.setInt64 = function(offset, value) {
-    var hi = Math.floor(value / kHighWordMultiplier);
-    if (kHostIsLittleEndian) {
-      this.dataView.setInt32(offset, value, kHostIsLittleEndian);
-      this.dataView.setInt32(offset + 4, hi, kHostIsLittleEndian);
-    } else {
-      this.dataView.setInt32(offset, hi, kHostIsLittleEndian);
-      this.dataView.setInt32(offset + 4, value, kHostIsLittleEndian);
-    }
-  }
-
-  Buffer.prototype.setFloat32 = function(offset, value) {
-    this.dataView.setFloat32(offset, value, kHostIsLittleEndian);
-  }
-  Buffer.prototype.setFloat64 = function(offset, value) {
-    this.dataView.setFloat64(offset, value, kHostIsLittleEndian);
-  }
-
-  internal.Buffer = Buffer;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  var kErrorUnsigned = "Passing negative value to unsigned";
-  var kErrorArray = "Passing non Array for array type";
-  var kErrorString = "Passing non String for string type";
-  var kErrorMap = "Passing non Map for map type";
-
-  // Memory -------------------------------------------------------------------
-
-  var kAlignment = 8;
-
-  function align(size) {
-    return size + (kAlignment - (size % kAlignment)) % kAlignment;
-  }
-
-  function isAligned(offset) {
-    return offset >= 0 && (offset % kAlignment) === 0;
-  }
-
-  // Constants ----------------------------------------------------------------
-
-  var kArrayHeaderSize = 8;
-  var kStructHeaderSize = 8;
-  var kMessageV0HeaderSize = 24;
-  var kMessageV1HeaderSize = 32;
-  var kMessageV2HeaderSize = 48;
-  var kMapStructPayloadSize = 16;
-
-  var kStructHeaderNumBytesOffset = 0;
-  var kStructHeaderVersionOffset = 4;
-
-  var kEncodedInvalidHandleValue = 0xFFFFFFFF;
-
-  // Decoder ------------------------------------------------------------------
-
-  function Decoder(buffer, handles, associatedEndpointHandles, base) {
-    this.buffer = buffer;
-    this.handles = handles;
-    this.associatedEndpointHandles = associatedEndpointHandles;
-    this.base = base;
-    this.next = base;
-  }
-
-  Decoder.prototype.align = function() {
-    this.next = align(this.next);
-  };
-
-  Decoder.prototype.skip = function(offset) {
-    this.next += offset;
-  };
-
-  Decoder.prototype.readInt8 = function() {
-    var result = this.buffer.getInt8(this.next);
-    this.next += 1;
-    return result;
-  };
-
-  Decoder.prototype.readUint8 = function() {
-    var result = this.buffer.getUint8(this.next);
-    this.next += 1;
-    return result;
-  };
-
-  Decoder.prototype.readInt16 = function() {
-    var result = this.buffer.getInt16(this.next);
-    this.next += 2;
-    return result;
-  };
-
-  Decoder.prototype.readUint16 = function() {
-    var result = this.buffer.getUint16(this.next);
-    this.next += 2;
-    return result;
-  };
-
-  Decoder.prototype.readInt32 = function() {
-    var result = this.buffer.getInt32(this.next);
-    this.next += 4;
-    return result;
-  };
-
-  Decoder.prototype.readUint32 = function() {
-    var result = this.buffer.getUint32(this.next);
-    this.next += 4;
-    return result;
-  };
-
-  Decoder.prototype.readInt64 = function() {
-    var result = this.buffer.getInt64(this.next);
-    this.next += 8;
-    return result;
-  };
-
-  Decoder.prototype.readUint64 = function() {
-    var result = this.buffer.getUint64(this.next);
-    this.next += 8;
-    return result;
-  };
-
-  Decoder.prototype.readFloat = function() {
-    var result = this.buffer.getFloat32(this.next);
-    this.next += 4;
-    return result;
-  };
-
-  Decoder.prototype.readDouble = function() {
-    var result = this.buffer.getFloat64(this.next);
-    this.next += 8;
-    return result;
-  };
-
-  Decoder.prototype.decodePointer = function() {
-    // TODO(abarth): To correctly decode a pointer, we need to know the real
-    // base address of the array buffer.
-    var offsetPointer = this.next;
-    var offset = this.readUint64();
-    if (!offset)
-      return 0;
-    return offsetPointer + offset;
-  };
-
-  Decoder.prototype.decodeAndCreateDecoder = function(pointer) {
-    return new Decoder(this.buffer, this.handles,
-        this.associatedEndpointHandles, pointer);
-  };
-
-  Decoder.prototype.decodeHandle = function() {
-    return this.handles[this.readUint32()] || null;
-  };
-
-  Decoder.prototype.decodeAssociatedEndpointHandle = function() {
-    return this.associatedEndpointHandles[this.readUint32()] || null;
-  };
-
-  Decoder.prototype.decodeString = function() {
-    var numberOfBytes = this.readUint32();
-    var numberOfElements = this.readUint32();
-    var base = this.next;
-    this.next += numberOfElements;
-    return internal.decodeUtf8String(
-        new Uint8Array(this.buffer.arrayBuffer, base, numberOfElements));
-  };
-
-  Decoder.prototype.decodeArray = function(cls) {
-    var numberOfBytes = this.readUint32();
-    var numberOfElements = this.readUint32();
-    var val = new Array(numberOfElements);
-    if (cls === PackedBool) {
-      var byte;
-      for (var i = 0; i < numberOfElements; ++i) {
-        if (i % 8 === 0)
-          byte = this.readUint8();
-        val[i] = (byte & (1 << i % 8)) ? true : false;
-      }
-    } else {
-      for (var i = 0; i < numberOfElements; ++i) {
-        val[i] = cls.decode(this);
-      }
-    }
-    return val;
-  };
-
-  Decoder.prototype.decodeStruct = function(cls) {
-    return cls.decode(this);
-  };
-
-  Decoder.prototype.decodeStructPointer = function(cls) {
-    var pointer = this.decodePointer();
-    if (!pointer) {
-      return null;
-    }
-    return cls.decode(this.decodeAndCreateDecoder(pointer));
-  };
-
-  Decoder.prototype.decodeArrayPointer = function(cls) {
-    var pointer = this.decodePointer();
-    if (!pointer) {
-      return null;
-    }
-    return this.decodeAndCreateDecoder(pointer).decodeArray(cls);
-  };
-
-  Decoder.prototype.decodeStringPointer = function() {
-    var pointer = this.decodePointer();
-    if (!pointer) {
-      return null;
-    }
-    return this.decodeAndCreateDecoder(pointer).decodeString();
-  };
-
-  Decoder.prototype.decodeMap = function(keyClass, valueClass) {
-    this.skip(4); // numberOfBytes
-    this.skip(4); // version
-    var keys = this.decodeArrayPointer(keyClass);
-    var values = this.decodeArrayPointer(valueClass);
-    var val = new Map();
-    for (var i = 0; i < keys.length; i++)
-      val.set(keys[i], values[i]);
-    return val;
-  };
-
-  Decoder.prototype.decodeMapPointer = function(keyClass, valueClass) {
-    var pointer = this.decodePointer();
-    if (!pointer) {
-      return null;
-    }
-    var decoder = this.decodeAndCreateDecoder(pointer);
-    return decoder.decodeMap(keyClass, valueClass);
-  };
-
-  // Encoder ------------------------------------------------------------------
-
-  function Encoder(buffer, handles, associatedEndpointHandles, base) {
-    this.buffer = buffer;
-    this.handles = handles;
-    this.associatedEndpointHandles = associatedEndpointHandles;
-    this.base = base;
-    this.next = base;
-  }
-
-  Encoder.prototype.align = function() {
-    this.next = align(this.next);
-  };
-
-  Encoder.prototype.skip = function(offset) {
-    this.next += offset;
-  };
-
-  Encoder.prototype.writeInt8 = function(val) {
-    this.buffer.setInt8(this.next, val);
-    this.next += 1;
-  };
-
-  Encoder.prototype.writeUint8 = function(val) {
-    if (val < 0) {
-      throw new Error(kErrorUnsigned);
-    }
-    this.buffer.setUint8(this.next, val);
-    this.next += 1;
-  };
-
-  Encoder.prototype.writeInt16 = function(val) {
-    this.buffer.setInt16(this.next, val);
-    this.next += 2;
-  };
-
-  Encoder.prototype.writeUint16 = function(val) {
-    if (val < 0) {
-      throw new Error(kErrorUnsigned);
-    }
-    this.buffer.setUint16(this.next, val);
-    this.next += 2;
-  };
-
-  Encoder.prototype.writeInt32 = function(val) {
-    this.buffer.setInt32(this.next, val);
-    this.next += 4;
-  };
-
-  Encoder.prototype.writeUint32 = function(val) {
-    if (val < 0) {
-      throw new Error(kErrorUnsigned);
-    }
-    this.buffer.setUint32(this.next, val);
-    this.next += 4;
-  };
-
-  Encoder.prototype.writeInt64 = function(val) {
-    this.buffer.setInt64(this.next, val);
-    this.next += 8;
-  };
-
-  Encoder.prototype.writeUint64 = function(val) {
-    if (val < 0) {
-      throw new Error(kErrorUnsigned);
-    }
-    this.buffer.setUint64(this.next, val);
-    this.next += 8;
-  };
-
-  Encoder.prototype.writeFloat = function(val) {
-    this.buffer.setFloat32(this.next, val);
-    this.next += 4;
-  };
-
-  Encoder.prototype.writeDouble = function(val) {
-    this.buffer.setFloat64(this.next, val);
-    this.next += 8;
-  };
-
-  Encoder.prototype.encodePointer = function(pointer) {
-    if (!pointer)
-      return this.writeUint64(0);
-    // TODO(abarth): To correctly encode a pointer, we need to know the real
-    // base address of the array buffer.
-    var offset = pointer - this.next;
-    this.writeUint64(offset);
-  };
-
-  Encoder.prototype.createAndEncodeEncoder = function(size) {
-    var pointer = this.buffer.alloc(align(size));
-    this.encodePointer(pointer);
-    return new Encoder(this.buffer, this.handles,
-        this.associatedEndpointHandles, pointer);
-  };
-
-  Encoder.prototype.encodeHandle = function(handle) {
-    if (handle) {
-      this.handles.push(handle);
-      this.writeUint32(this.handles.length - 1);
-    } else {
-      this.writeUint32(kEncodedInvalidHandleValue);
-    }
-  };
-
-  Encoder.prototype.encodeAssociatedEndpointHandle = function(endpointHandle) {
-    if (endpointHandle) {
-      this.associatedEndpointHandles.push(endpointHandle);
-      this.writeUint32(this.associatedEndpointHandles.length - 1);
-    } else {
-      this.writeUint32(kEncodedInvalidHandleValue);
-    }
-  };
-
-  Encoder.prototype.encodeString = function(val) {
-    var base = this.next + kArrayHeaderSize;
-    var numberOfElements = internal.encodeUtf8String(
-        val, new Uint8Array(this.buffer.arrayBuffer, base));
-    var numberOfBytes = kArrayHeaderSize + numberOfElements;
-    this.writeUint32(numberOfBytes);
-    this.writeUint32(numberOfElements);
-    this.next += numberOfElements;
-  };
-
-  Encoder.prototype.encodeArray =
-      function(cls, val, numberOfElements, encodedSize) {
-    if (numberOfElements === undefined)
-      numberOfElements = val.length;
-    if (encodedSize === undefined)
-      encodedSize = kArrayHeaderSize + cls.encodedSize * numberOfElements;
-
-    this.writeUint32(encodedSize);
-    this.writeUint32(numberOfElements);
-
-    if (cls === PackedBool) {
-      var byte = 0;
-      for (i = 0; i < numberOfElements; ++i) {
-        if (val[i])
-          byte |= (1 << i % 8);
-        if (i % 8 === 7 || i == numberOfElements - 1) {
-          Uint8.encode(this, byte);
-          byte = 0;
-        }
-      }
-    } else {
-      for (var i = 0; i < numberOfElements; ++i)
-        cls.encode(this, val[i]);
-    }
-  };
-
-  Encoder.prototype.encodeStruct = function(cls, val) {
-    return cls.encode(this, val);
-  };
-
-  Encoder.prototype.encodeStructPointer = function(cls, val) {
-    if (val == null) {
-      // Also handles undefined, since undefined == null.
-      this.encodePointer(val);
-      return;
-    }
-    var encoder = this.createAndEncodeEncoder(cls.encodedSize);
-    cls.encode(encoder, val);
-  };
-
-  Encoder.prototype.encodeArrayPointer = function(cls, val) {
-    if (val == null) {
-      // Also handles undefined, since undefined == null.
-      this.encodePointer(val);
-      return;
-    }
-
-    var numberOfElements = val.length;
-    if (!Number.isSafeInteger(numberOfElements) || numberOfElements < 0)
-      throw new Error(kErrorArray);
-
-    var encodedSize = kArrayHeaderSize + ((cls === PackedBool) ?
-        Math.ceil(numberOfElements / 8) : cls.encodedSize * numberOfElements);
-    var encoder = this.createAndEncodeEncoder(encodedSize);
-    encoder.encodeArray(cls, val, numberOfElements, encodedSize);
-  };
-
-  Encoder.prototype.encodeStringPointer = function(val) {
-    if (val == null) {
-      // Also handles undefined, since undefined == null.
-      this.encodePointer(val);
-      return;
-    }
-    // Only accepts string primivites, not String Objects like new String("foo")
-    if (typeof(val) !== "string") {
-      throw new Error(kErrorString);
-    }
-    var encodedSize = kArrayHeaderSize + internal.utf8Length(val);
-    var encoder = this.createAndEncodeEncoder(encodedSize);
-    encoder.encodeString(val);
-  };
-
-  Encoder.prototype.encodeMap = function(keyClass, valueClass, val) {
-    var keys = new Array(val.size);
-    var values = new Array(val.size);
-    var i = 0;
-    val.forEach(function(value, key) {
-      values[i] = value;
-      keys[i++] = key;
-    });
-    this.writeUint32(kStructHeaderSize + kMapStructPayloadSize);
-    this.writeUint32(0);  // version
-    this.encodeArrayPointer(keyClass, keys);
-    this.encodeArrayPointer(valueClass, values);
-  }
-
-  Encoder.prototype.encodeMapPointer = function(keyClass, valueClass, val) {
-    if (val == null) {
-      // Also handles undefined, since undefined == null.
-      this.encodePointer(val);
-      return;
-    }
-    if (!(val instanceof Map)) {
-      throw new Error(kErrorMap);
-    }
-    var encodedSize = kStructHeaderSize + kMapStructPayloadSize;
-    var encoder = this.createAndEncodeEncoder(encodedSize);
-    encoder.encodeMap(keyClass, valueClass, val);
-  };
-
-  // Message ------------------------------------------------------------------
-
-  var kMessageInterfaceIdOffset = kStructHeaderSize;
-  var kMessageNameOffset = kMessageInterfaceIdOffset + 4;
-  var kMessageFlagsOffset = kMessageNameOffset + 4;
-  var kMessageRequestIDOffset = kMessageFlagsOffset + 8;
-  var kMessagePayloadInterfaceIdsPointerOffset = kMessageV2HeaderSize - 8;
-
-  var kMessageExpectsResponse = 1 << 0;
-  var kMessageIsResponse      = 1 << 1;
-
-  function Message(buffer, handles, associatedEndpointHandles) {
-    if (associatedEndpointHandles === undefined) {
-      associatedEndpointHandles = [];
-    }
-
-    this.buffer = buffer;
-    this.handles = handles;
-    this.associatedEndpointHandles = associatedEndpointHandles;
-  }
-
-  Message.prototype.getHeaderNumBytes = function() {
-    return this.buffer.getUint32(kStructHeaderNumBytesOffset);
-  };
-
-  Message.prototype.getHeaderVersion = function() {
-    return this.buffer.getUint32(kStructHeaderVersionOffset);
-  };
-
-  Message.prototype.getName = function() {
-    return this.buffer.getUint32(kMessageNameOffset);
-  };
-
-  Message.prototype.getFlags = function() {
-    return this.buffer.getUint32(kMessageFlagsOffset);
-  };
-
-  Message.prototype.getInterfaceId = function() {
-    return this.buffer.getUint32(kMessageInterfaceIdOffset);
-  };
-
-  Message.prototype.getPayloadInterfaceIds = function() {
-    if (this.getHeaderVersion() < 2) {
-      return null;
-    }
-
-    var decoder = new Decoder(this.buffer, this.handles,
-        this.associatedEndpointHandles,
-        kMessagePayloadInterfaceIdsPointerOffset);
-    var payloadInterfaceIds = decoder.decodeArrayPointer(Uint32);
-    return payloadInterfaceIds;
-  };
-
-  Message.prototype.isResponse = function() {
-    return (this.getFlags() & kMessageIsResponse) != 0;
-  };
-
-  Message.prototype.expectsResponse = function() {
-    return (this.getFlags() & kMessageExpectsResponse) != 0;
-  };
-
-  Message.prototype.setRequestID = function(requestID) {
-    // TODO(darin): Verify that space was reserved for this field!
-    this.buffer.setUint64(kMessageRequestIDOffset, requestID);
-  };
-
-  Message.prototype.setInterfaceId = function(interfaceId) {
-    this.buffer.setUint32(kMessageInterfaceIdOffset, interfaceId);
-  };
-
-  Message.prototype.setPayloadInterfaceIds_ = function(payloadInterfaceIds) {
-    if (this.getHeaderVersion() < 2) {
-      throw new Error(
-          "Version of message does not support payload interface ids");
-    }
-
-    var decoder = new Decoder(this.buffer, this.handles,
-        this.associatedEndpointHandles,
-        kMessagePayloadInterfaceIdsPointerOffset);
-    var payloadInterfaceIdsOffset = decoder.decodePointer();
-    var encoder = new Encoder(this.buffer, this.handles,
-        this.associatedEndpointHandles,
-        payloadInterfaceIdsOffset);
-    encoder.encodeArray(Uint32, payloadInterfaceIds);
-  };
-
-  Message.prototype.serializeAssociatedEndpointHandles = function(
-      associatedGroupController) {
-    if (this.associatedEndpointHandles.length > 0) {
-      if (this.getHeaderVersion() < 2) {
-        throw new Error(
-            "Version of message does not support associated endpoint handles");
-      }
-
-      var data = [];
-      for (var i = 0; i < this.associatedEndpointHandles.length; i++) {
-        var handle = this.associatedEndpointHandles[i];
-        data.push(associatedGroupController.associateInterface(handle));
-      }
-      this.associatedEndpointHandles = [];
-      this.setPayloadInterfaceIds_(data);
-    }
-  };
-
-  Message.prototype.deserializeAssociatedEndpointHandles = function(
-      associatedGroupController) {
-    if (this.getHeaderVersion() < 2) {
-      return true;
-    }
-
-    this.associatedEndpointHandles = [];
-    var ids = this.getPayloadInterfaceIds();
-
-    var result = true;
-    for (var i = 0; i < ids.length; i++) {
-      var handle = associatedGroupController.createLocalEndpointHandle(ids[i]);
-      if (internal.isValidInterfaceId(ids[i]) && !handle.isValid()) {
-        // |ids[i]| itself is valid but handle creation failed. In that case,
-        // mark deserialization as failed but continue to deserialize the
-        // rest of handles.
-        result = false;
-      }
-      this.associatedEndpointHandles.push(handle);
-      ids[i] = internal.kInvalidInterfaceId;
-    }
-
-    this.setPayloadInterfaceIds_(ids);
-    return result;
-  };
-
-
-  // MessageV0Builder ---------------------------------------------------------
-
-  function MessageV0Builder(messageName, payloadSize) {
-    // Currently, we don't compute the payload size correctly ahead of time.
-    // Instead, we resize the buffer at the end.
-    var numberOfBytes = kMessageV0HeaderSize + payloadSize;
-    this.buffer = new internal.Buffer(numberOfBytes);
-    this.handles = [];
-    var encoder = this.createEncoder(kMessageV0HeaderSize);
-    encoder.writeUint32(kMessageV0HeaderSize);
-    encoder.writeUint32(0);  // version.
-    encoder.writeUint32(0);  // interface ID.
-    encoder.writeUint32(messageName);
-    encoder.writeUint32(0);  // flags.
-    encoder.writeUint32(0);  // padding.
-  }
-
-  MessageV0Builder.prototype.createEncoder = function(size) {
-    var pointer = this.buffer.alloc(size);
-    return new Encoder(this.buffer, this.handles, [], pointer);
-  };
-
-  MessageV0Builder.prototype.encodeStruct = function(cls, val) {
-    cls.encode(this.createEncoder(cls.encodedSize), val);
-  };
-
-  MessageV0Builder.prototype.finish = function() {
-    // TODO(abarth): Rather than resizing the buffer at the end, we could
-    // compute the size we need ahead of time, like we do in C++.
-    this.buffer.trim();
-    var message = new Message(this.buffer, this.handles);
-    this.buffer = null;
-    this.handles = null;
-    this.encoder = null;
-    return message;
-  };
-
-  // MessageV1Builder -----------------------------------------------
-
-  function MessageV1Builder(messageName, payloadSize, flags,
-                                       requestID) {
-    // Currently, we don't compute the payload size correctly ahead of time.
-    // Instead, we resize the buffer at the end.
-    var numberOfBytes = kMessageV1HeaderSize + payloadSize;
-    this.buffer = new internal.Buffer(numberOfBytes);
-    this.handles = [];
-    var encoder = this.createEncoder(kMessageV1HeaderSize);
-    encoder.writeUint32(kMessageV1HeaderSize);
-    encoder.writeUint32(1);  // version.
-    encoder.writeUint32(0);  // interface ID.
-    encoder.writeUint32(messageName);
-    encoder.writeUint32(flags);
-    encoder.writeUint32(0);  // padding.
-    encoder.writeUint64(requestID);
-  }
-
-  MessageV1Builder.prototype =
-      Object.create(MessageV0Builder.prototype);
-
-  MessageV1Builder.prototype.constructor =
-      MessageV1Builder;
-
-  // MessageV2 -----------------------------------------------
-
-  function MessageV2Builder(messageName, payloadSize, flags, requestID) {
-    // Currently, we don't compute the payload size correctly ahead of time.
-    // Instead, we resize the buffer at the end.
-    var numberOfBytes = kMessageV2HeaderSize + payloadSize;
-    this.buffer = new internal.Buffer(numberOfBytes);
-    this.handles = [];
-
-    this.payload = null;
-    this.associatedEndpointHandles = [];
-
-    this.encoder = this.createEncoder(kMessageV2HeaderSize);
-    this.encoder.writeUint32(kMessageV2HeaderSize);
-    this.encoder.writeUint32(2);  // version.
-    // Gets set to an appropriate interfaceId for the endpoint by the Router.
-    this.encoder.writeUint32(0);  // interface ID.
-    this.encoder.writeUint32(messageName);
-    this.encoder.writeUint32(flags);
-    this.encoder.writeUint32(0);  // padding.
-    this.encoder.writeUint64(requestID);
-  }
-
-  MessageV2Builder.prototype.createEncoder = function(size) {
-    var pointer = this.buffer.alloc(size);
-    return new Encoder(this.buffer, this.handles,
-        this.associatedEndpointHandles, pointer);
-  };
-
-  MessageV2Builder.prototype.setPayload = function(cls, val) {
-    this.payload = {cls: cls, val: val};
-  };
-
-  MessageV2Builder.prototype.finish = function() {
-    if (!this.payload) {
-      throw new Error("Payload needs to be set before calling finish");
-    }
-
-    this.encoder.encodeStructPointer(this.payload.cls, this.payload.val);
-    this.encoder.encodeArrayPointer(Uint32,
-        new Array(this.associatedEndpointHandles.length));
-
-    this.buffer.trim();
-    var message = new Message(this.buffer, this.handles,
-        this.associatedEndpointHandles);
-    this.buffer = null;
-    this.handles = null;
-    this.encoder = null;
-    this.payload = null;
-    this.associatedEndpointHandles = null;
-
-    return message;
-  };
-
-  // MessageReader ------------------------------------------------------------
-
-  function MessageReader(message) {
-    this.decoder = new Decoder(message.buffer, message.handles,
-        message.associatedEndpointHandles, 0);
-    var messageHeaderSize = this.decoder.readUint32();
-    this.payloadSize = message.buffer.byteLength - messageHeaderSize;
-    var version = this.decoder.readUint32();
-    var interface_id = this.decoder.readUint32();
-    this.messageName = this.decoder.readUint32();
-    this.flags = this.decoder.readUint32();
-    // Skip the padding.
-    this.decoder.skip(4);
-    if (version >= 1)
-      this.requestID = this.decoder.readUint64();
-    this.decoder.skip(messageHeaderSize - this.decoder.next);
-  }
-
-  MessageReader.prototype.decodeStruct = function(cls) {
-    return cls.decode(this.decoder);
-  };
-
-  // Built-in types -----------------------------------------------------------
-
-  // This type is only used with ArrayOf(PackedBool).
-  function PackedBool() {
-  }
-
-  function Int8() {
-  }
-
-  Int8.encodedSize = 1;
-
-  Int8.decode = function(decoder) {
-    return decoder.readInt8();
-  };
-
-  Int8.encode = function(encoder, val) {
-    encoder.writeInt8(val);
-  };
-
-  Uint8.encode = function(encoder, val) {
-    encoder.writeUint8(val);
-  };
-
-  function Uint8() {
-  }
-
-  Uint8.encodedSize = 1;
-
-  Uint8.decode = function(decoder) {
-    return decoder.readUint8();
-  };
-
-  Uint8.encode = function(encoder, val) {
-    encoder.writeUint8(val);
-  };
-
-  function Int16() {
-  }
-
-  Int16.encodedSize = 2;
-
-  Int16.decode = function(decoder) {
-    return decoder.readInt16();
-  };
-
-  Int16.encode = function(encoder, val) {
-    encoder.writeInt16(val);
-  };
-
-  function Uint16() {
-  }
-
-  Uint16.encodedSize = 2;
-
-  Uint16.decode = function(decoder) {
-    return decoder.readUint16();
-  };
-
-  Uint16.encode = function(encoder, val) {
-    encoder.writeUint16(val);
-  };
-
-  function Int32() {
-  }
-
-  Int32.encodedSize = 4;
-
-  Int32.decode = function(decoder) {
-    return decoder.readInt32();
-  };
-
-  Int32.encode = function(encoder, val) {
-    encoder.writeInt32(val);
-  };
-
-  function Uint32() {
-  }
-
-  Uint32.encodedSize = 4;
-
-  Uint32.decode = function(decoder) {
-    return decoder.readUint32();
-  };
-
-  Uint32.encode = function(encoder, val) {
-    encoder.writeUint32(val);
-  };
-
-  function Int64() {
-  }
-
-  Int64.encodedSize = 8;
-
-  Int64.decode = function(decoder) {
-    return decoder.readInt64();
-  };
-
-  Int64.encode = function(encoder, val) {
-    encoder.writeInt64(val);
-  };
-
-  function Uint64() {
-  }
-
-  Uint64.encodedSize = 8;
-
-  Uint64.decode = function(decoder) {
-    return decoder.readUint64();
-  };
-
-  Uint64.encode = function(encoder, val) {
-    encoder.writeUint64(val);
-  };
-
-  function String() {
-  };
-
-  String.encodedSize = 8;
-
-  String.decode = function(decoder) {
-    return decoder.decodeStringPointer();
-  };
-
-  String.encode = function(encoder, val) {
-    encoder.encodeStringPointer(val);
-  };
-
-  function NullableString() {
-  }
-
-  NullableString.encodedSize = String.encodedSize;
-
-  NullableString.decode = String.decode;
-
-  NullableString.encode = String.encode;
-
-  function Float() {
-  }
-
-  Float.encodedSize = 4;
-
-  Float.decode = function(decoder) {
-    return decoder.readFloat();
-  };
-
-  Float.encode = function(encoder, val) {
-    encoder.writeFloat(val);
-  };
-
-  function Double() {
-  }
-
-  Double.encodedSize = 8;
-
-  Double.decode = function(decoder) {
-    return decoder.readDouble();
-  };
-
-  Double.encode = function(encoder, val) {
-    encoder.writeDouble(val);
-  };
-
-  function Enum(cls) {
-    this.cls = cls;
-  }
-
-  Enum.prototype.encodedSize = 4;
-
-  Enum.prototype.decode = function(decoder) {
-    return decoder.readInt32();
-  };
-
-  Enum.prototype.encode = function(encoder, val) {
-    encoder.writeInt32(val);
-  };
-
-  function PointerTo(cls) {
-    this.cls = cls;
-  }
-
-  PointerTo.prototype.encodedSize = 8;
-
-  PointerTo.prototype.decode = function(decoder) {
-    var pointer = decoder.decodePointer();
-    if (!pointer) {
-      return null;
-    }
-    return this.cls.decode(decoder.decodeAndCreateDecoder(pointer));
-  };
-
-  PointerTo.prototype.encode = function(encoder, val) {
-    if (!val) {
-      encoder.encodePointer(val);
-      return;
-    }
-    var objectEncoder = encoder.createAndEncodeEncoder(this.cls.encodedSize);
-    this.cls.encode(objectEncoder, val);
-  };
-
-  function NullablePointerTo(cls) {
-    PointerTo.call(this, cls);
-  }
-
-  NullablePointerTo.prototype = Object.create(PointerTo.prototype);
-
-  function ArrayOf(cls, length) {
-    this.cls = cls;
-    this.length = length || 0;
-  }
-
-  ArrayOf.prototype.encodedSize = 8;
-
-  ArrayOf.prototype.dimensions = function() {
-    return [this.length].concat(
-      (this.cls instanceof ArrayOf) ? this.cls.dimensions() : []);
-  }
-
-  ArrayOf.prototype.decode = function(decoder) {
-    return decoder.decodeArrayPointer(this.cls);
-  };
-
-  ArrayOf.prototype.encode = function(encoder, val) {
-    encoder.encodeArrayPointer(this.cls, val);
-  };
-
-  function NullableArrayOf(cls) {
-    ArrayOf.call(this, cls);
-  }
-
-  NullableArrayOf.prototype = Object.create(ArrayOf.prototype);
-
-  function Handle() {
-  }
-
-  Handle.encodedSize = 4;
-
-  Handle.decode = function(decoder) {
-    return decoder.decodeHandle();
-  };
-
-  Handle.encode = function(encoder, val) {
-    encoder.encodeHandle(val);
-  };
-
-  function NullableHandle() {
-  }
-
-  NullableHandle.encodedSize = Handle.encodedSize;
-
-  NullableHandle.decode = Handle.decode;
-
-  NullableHandle.encode = Handle.encode;
-
-  function Interface(cls) {
-    this.cls = cls;
-  }
-
-  Interface.prototype.encodedSize = 8;
-
-  Interface.prototype.decode = function(decoder) {
-    var interfacePtrInfo = new mojo.InterfacePtrInfo(
-        decoder.decodeHandle(), decoder.readUint32());
-    var interfacePtr = new this.cls();
-    interfacePtr.ptr.bind(interfacePtrInfo);
-    return interfacePtr;
-  };
-
-  Interface.prototype.encode = function(encoder, val) {
-    var interfacePtrInfo =
-        val ? val.ptr.passInterface() : new mojo.InterfacePtrInfo(null, 0);
-    encoder.encodeHandle(interfacePtrInfo.handle);
-    encoder.writeUint32(interfacePtrInfo.version);
-  };
-
-  function NullableInterface(cls) {
-    Interface.call(this, cls);
-  }
-
-  NullableInterface.prototype = Object.create(Interface.prototype);
-
-  function AssociatedInterfacePtrInfo() {
-  }
-
-  AssociatedInterfacePtrInfo.prototype.encodedSize = 8;
-
-  AssociatedInterfacePtrInfo.decode = function(decoder) {
-    return new mojo.AssociatedInterfacePtrInfo(
-      decoder.decodeAssociatedEndpointHandle(), decoder.readUint32());
-  };
-
-  AssociatedInterfacePtrInfo.encode = function(encoder, val) {
-    var associatedinterfacePtrInfo =
-        val ? val : new mojo.AssociatedInterfacePtrInfo(null, 0);
-    encoder.encodeAssociatedEndpointHandle(
-        associatedinterfacePtrInfo.interfaceEndpointHandle);
-    encoder.writeUint32(associatedinterfacePtrInfo.version);
-  };
-
-  function NullableAssociatedInterfacePtrInfo() {
-  }
-
-  NullableAssociatedInterfacePtrInfo.encodedSize =
-      AssociatedInterfacePtrInfo.encodedSize;
-
-  NullableAssociatedInterfacePtrInfo.decode =
-      AssociatedInterfacePtrInfo.decode;
-
-  NullableAssociatedInterfacePtrInfo.encode =
-      AssociatedInterfacePtrInfo.encode;
-
-  function InterfaceRequest() {
-  }
-
-  InterfaceRequest.encodedSize = 4;
-
-  InterfaceRequest.decode = function(decoder) {
-    return new mojo.InterfaceRequest(decoder.decodeHandle());
-  };
-
-  InterfaceRequest.encode = function(encoder, val) {
-    encoder.encodeHandle(val ? val.handle : null);
-  };
-
-  function NullableInterfaceRequest() {
-  }
-
-  NullableInterfaceRequest.encodedSize = InterfaceRequest.encodedSize;
-
-  NullableInterfaceRequest.decode = InterfaceRequest.decode;
-
-  NullableInterfaceRequest.encode = InterfaceRequest.encode;
-
-  function AssociatedInterfaceRequest() {
-  }
-
-  AssociatedInterfaceRequest.decode = function(decoder) {
-    var handle = decoder.decodeAssociatedEndpointHandle();
-    return new mojo.AssociatedInterfaceRequest(handle);
-  };
-
-  AssociatedInterfaceRequest.encode = function(encoder, val) {
-    encoder.encodeAssociatedEndpointHandle(
-        val ? val.interfaceEndpointHandle : null);
-  };
-
-  AssociatedInterfaceRequest.encodedSize = 4;
-
-  function NullableAssociatedInterfaceRequest() {
-  }
-
-  NullableAssociatedInterfaceRequest.encodedSize =
-      AssociatedInterfaceRequest.encodedSize;
-
-  NullableAssociatedInterfaceRequest.decode =
-      AssociatedInterfaceRequest.decode;
-
-  NullableAssociatedInterfaceRequest.encode =
-      AssociatedInterfaceRequest.encode;
-
-  function MapOf(keyClass, valueClass) {
-    this.keyClass = keyClass;
-    this.valueClass = valueClass;
-  }
-
-  MapOf.prototype.encodedSize = 8;
-
-  MapOf.prototype.decode = function(decoder) {
-    return decoder.decodeMapPointer(this.keyClass, this.valueClass);
-  };
-
-  MapOf.prototype.encode = function(encoder, val) {
-    encoder.encodeMapPointer(this.keyClass, this.valueClass, val);
-  };
-
-  function NullableMapOf(keyClass, valueClass) {
-    MapOf.call(this, keyClass, valueClass);
-  }
-
-  NullableMapOf.prototype = Object.create(MapOf.prototype);
-
-  internal.align = align;
-  internal.isAligned = isAligned;
-  internal.Message = Message;
-  internal.MessageV0Builder = MessageV0Builder;
-  internal.MessageV1Builder = MessageV1Builder;
-  internal.MessageV2Builder = MessageV2Builder;
-  internal.MessageReader = MessageReader;
-  internal.kArrayHeaderSize = kArrayHeaderSize;
-  internal.kMapStructPayloadSize = kMapStructPayloadSize;
-  internal.kStructHeaderSize = kStructHeaderSize;
-  internal.kEncodedInvalidHandleValue = kEncodedInvalidHandleValue;
-  internal.kMessageV0HeaderSize = kMessageV0HeaderSize;
-  internal.kMessageV1HeaderSize = kMessageV1HeaderSize;
-  internal.kMessageV2HeaderSize = kMessageV2HeaderSize;
-  internal.kMessagePayloadInterfaceIdsPointerOffset =
-      kMessagePayloadInterfaceIdsPointerOffset;
-  internal.kMessageExpectsResponse = kMessageExpectsResponse;
-  internal.kMessageIsResponse = kMessageIsResponse;
-  internal.Int8 = Int8;
-  internal.Uint8 = Uint8;
-  internal.Int16 = Int16;
-  internal.Uint16 = Uint16;
-  internal.Int32 = Int32;
-  internal.Uint32 = Uint32;
-  internal.Int64 = Int64;
-  internal.Uint64 = Uint64;
-  internal.Float = Float;
-  internal.Double = Double;
-  internal.String = String;
-  internal.Enum = Enum;
-  internal.NullableString = NullableString;
-  internal.PointerTo = PointerTo;
-  internal.NullablePointerTo = NullablePointerTo;
-  internal.ArrayOf = ArrayOf;
-  internal.NullableArrayOf = NullableArrayOf;
-  internal.PackedBool = PackedBool;
-  internal.Handle = Handle;
-  internal.NullableHandle = NullableHandle;
-  internal.Interface = Interface;
-  internal.NullableInterface = NullableInterface;
-  internal.InterfaceRequest = InterfaceRequest;
-  internal.NullableInterfaceRequest = NullableInterfaceRequest;
-  internal.AssociatedInterfacePtrInfo = AssociatedInterfacePtrInfo;
-  internal.NullableAssociatedInterfacePtrInfo =
-      NullableAssociatedInterfacePtrInfo;
-  internal.AssociatedInterfaceRequest = AssociatedInterfaceRequest;
-  internal.NullableAssociatedInterfaceRequest =
-      NullableAssociatedInterfaceRequest;
-  internal.MapOf = MapOf;
-  internal.NullableMapOf = NullableMapOf;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  function Connector(handle) {
-    if (!(handle instanceof MojoHandle))
-      throw new Error("Connector: not a handle " + handle);
-    this.handle_ = handle;
-    this.dropWrites_ = false;
-    this.error_ = false;
-    this.incomingReceiver_ = null;
-    this.readWatcher_ = null;
-    this.errorHandler_ = null;
-    this.paused_ = false;
-
-    this.waitToReadMore();
-  }
-
-  Connector.prototype.close = function() {
-    this.cancelWait();
-    if (this.handle_ != null) {
-      this.handle_.close();
-      this.handle_ = null;
-    }
-  };
-
-  Connector.prototype.pauseIncomingMethodCallProcessing = function() {
-    if (this.paused_) {
-      return;
-    }
-    this.paused_= true;
-    this.cancelWait();
-  };
-
-  Connector.prototype.resumeIncomingMethodCallProcessing = function() {
-    if (!this.paused_) {
-      return;
-    }
-    this.paused_= false;
-    this.waitToReadMore();
-  };
-
-  Connector.prototype.accept = function(message) {
-    if (this.error_)
-      return false;
-
-    if (this.dropWrites_)
-      return true;
-
-    var result = this.handle_.writeMessage(
-        new Uint8Array(message.buffer.arrayBuffer), message.handles);
-    switch (result) {
-      case Mojo.RESULT_OK:
-        // The handles were successfully transferred, so we don't own them
-        // anymore.
-        message.handles = [];
-        break;
-      case Mojo.RESULT_FAILED_PRECONDITION:
-        // There's no point in continuing to write to this pipe since the other
-        // end is gone. Avoid writing any future messages. Hide write failures
-        // from the caller since we'd like them to continue consuming any
-        // backlog of incoming messages before regarding the message pipe as
-        // closed.
-        this.dropWrites_ = true;
-        break;
-      default:
-        // This particular write was rejected, presumably because of bad input.
-        // The pipe is not necessarily in a bad state.
-        return false;
-    }
-    return true;
-  };
-
-  Connector.prototype.setIncomingReceiver = function(receiver) {
-    this.incomingReceiver_ = receiver;
-  };
-
-  Connector.prototype.setErrorHandler = function(handler) {
-    this.errorHandler_ = handler;
-  };
-
-  Connector.prototype.readMore_ = function(result) {
-    for (;;) {
-      if (this.paused_) {
-        return;
-      }
-
-      var read = this.handle_.readMessage();
-      if (this.handle_ == null) // The connector has been closed.
-        return;
-      if (read.result == Mojo.RESULT_SHOULD_WAIT)
-        return;
-      if (read.result != Mojo.RESULT_OK) {
-        this.handleError(read.result !== Mojo.RESULT_FAILED_PRECONDITION,
-            false);
-        return;
-      }
-      var messageBuffer = new internal.Buffer(read.buffer);
-      var message = new internal.Message(messageBuffer, read.handles);
-      var receiverResult = this.incomingReceiver_ &&
-          this.incomingReceiver_.accept(message);
-
-      // Dispatching the message may have closed the connector.
-      if (this.handle_ == null)
-        return;
-
-      // Handle invalid incoming message.
-      if (!internal.isTestingMode() && !receiverResult) {
-        // TODO(yzshen): Consider notifying the embedder.
-        this.handleError(true, false);
-      }
-    }
-  };
-
-  Connector.prototype.cancelWait = function() {
-    if (this.readWatcher_) {
-      this.readWatcher_.cancel();
-      this.readWatcher_ = null;
-    }
-  };
-
-  Connector.prototype.waitToReadMore = function() {
-    if (this.handle_) {
-      this.readWatcher_ = this.handle_.watch({readable: true},
-                                             this.readMore_.bind(this));
-    }
-  };
-
-  Connector.prototype.handleError = function(forcePipeReset,
-                                             forceAsyncHandler) {
-    if (this.error_ || this.handle_ === null) {
-      return;
-    }
-
-    if (this.paused_) {
-      // Enforce calling the error handler asynchronously if the user has
-      // paused receiving messages. We need to wait until the user starts
-      // receiving messages again.
-      forceAsyncHandler = true;
-    }
-
-    if (!forcePipeReset && forceAsyncHandler) {
-      forcePipeReset = true;
-    }
-
-    this.cancelWait();
-    if (forcePipeReset) {
-      this.handle_.close();
-      var dummyPipe = Mojo.createMessagePipe();
-      this.handle_ = dummyPipe.handle0;
-    }
-
-    if (forceAsyncHandler) {
-      if (!this.paused_) {
-        this.waitToReadMore();
-      }
-    } else {
-      this.error_ = true;
-      if (this.errorHandler_) {
-        this.errorHandler_.onError();
-      }
-    }
-  };
-
-  internal.Connector = Connector;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  function validateControlRequestWithResponse(message) {
-    var messageValidator = new internal.Validator(message);
-    var error = messageValidator.validateMessageIsRequestExpectingResponse();
-    if (error !== internal.validationError.NONE) {
-      throw error;
-    }
-
-    if (message.getName() != mojo.interfaceControl.kRunMessageId) {
-      throw new Error("Control message name is not kRunMessageId");
-    }
-
-    // Validate payload.
-    error = mojo.interfaceControl.RunMessageParams.validate(messageValidator,
-        message.getHeaderNumBytes());
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-  }
-
-  function validateControlRequestWithoutResponse(message) {
-    var messageValidator = new internal.Validator(message);
-    var error = messageValidator.validateMessageIsRequestWithoutResponse();
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-
-    if (message.getName() != mojo.interfaceControl.kRunOrClosePipeMessageId) {
-      throw new Error("Control message name is not kRunOrClosePipeMessageId");
-    }
-
-    // Validate payload.
-    error = mojo.interfaceControl.RunOrClosePipeMessageParams.validate(
-        messageValidator, message.getHeaderNumBytes());
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-  }
-
-  function runOrClosePipe(message, interfaceVersion) {
-    var reader = new internal.MessageReader(message);
-    var runOrClosePipeMessageParams = reader.decodeStruct(
-        mojo.interfaceControl.RunOrClosePipeMessageParams);
-    return interfaceVersion >=
-        runOrClosePipeMessageParams.input.requireVersion.version;
-  }
-
-  function run(message, responder, interfaceVersion) {
-    var reader = new internal.MessageReader(message);
-    var runMessageParams =
-        reader.decodeStruct(mojo.interfaceControl.RunMessageParams);
-    var runOutput = null;
-
-    if (runMessageParams.input.queryVersion) {
-      runOutput = new mojo.interfaceControl.RunOutput();
-      runOutput.queryVersionResult = new
-          mojo.interfaceControl.QueryVersionResult(
-              {'version': interfaceVersion});
-    }
-
-    var runResponseMessageParams = new
-        mojo.interfaceControl.RunResponseMessageParams();
-    runResponseMessageParams.output = runOutput;
-
-    var messageName = mojo.interfaceControl.kRunMessageId;
-    var payloadSize =
-        mojo.interfaceControl.RunResponseMessageParams.encodedSize;
-    var requestID = reader.requestID;
-    var builder = new internal.MessageV1Builder(messageName,
-        payloadSize, internal.kMessageIsResponse, requestID);
-    builder.encodeStruct(mojo.interfaceControl.RunResponseMessageParams,
-                         runResponseMessageParams);
-    responder.accept(builder.finish());
-    return true;
-  }
-
-  function isInterfaceControlMessage(message) {
-    return message.getName() == mojo.interfaceControl.kRunMessageId ||
-           message.getName() == mojo.interfaceControl.kRunOrClosePipeMessageId;
-  }
-
-  function ControlMessageHandler(interfaceVersion) {
-    this.interfaceVersion_ = interfaceVersion;
-  }
-
-  ControlMessageHandler.prototype.accept = function(message) {
-    validateControlRequestWithoutResponse(message);
-    return runOrClosePipe(message, this.interfaceVersion_);
-  };
-
-  ControlMessageHandler.prototype.acceptWithResponder = function(message,
-      responder) {
-    validateControlRequestWithResponse(message);
-    return run(message, responder, this.interfaceVersion_);
-  };
-
-  internal.ControlMessageHandler = ControlMessageHandler;
-  internal.isInterfaceControlMessage = isInterfaceControlMessage;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  function constructRunOrClosePipeMessage(runOrClosePipeInput) {
-    var runOrClosePipeMessageParams = new
-        mojo.interfaceControl.RunOrClosePipeMessageParams();
-    runOrClosePipeMessageParams.input = runOrClosePipeInput;
-
-    var messageName = mojo.interfaceControl.kRunOrClosePipeMessageId;
-    var payloadSize =
-        mojo.interfaceControl.RunOrClosePipeMessageParams.encodedSize;
-    var builder = new internal.MessageV0Builder(messageName, payloadSize);
-    builder.encodeStruct(mojo.interfaceControl.RunOrClosePipeMessageParams,
-                         runOrClosePipeMessageParams);
-    var message = builder.finish();
-    return message;
-  }
-
-  function validateControlResponse(message) {
-    var messageValidator = new internal.Validator(message);
-    var error = messageValidator.validateMessageIsResponse();
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-
-    if (message.getName() != mojo.interfaceControl.kRunMessageId) {
-      throw new Error("Control message name is not kRunMessageId");
-    }
-
-    // Validate payload.
-    error = mojo.interfaceControl.RunResponseMessageParams.validate(
-        messageValidator, message.getHeaderNumBytes());
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-  }
-
-  function acceptRunResponse(message) {
-    validateControlResponse(message);
-
-    var reader = new internal.MessageReader(message);
-    var runResponseMessageParams = reader.decodeStruct(
-        mojo.interfaceControl.RunResponseMessageParams);
-
-    return Promise.resolve(runResponseMessageParams);
-  }
-
- /**
-  * Sends the given run message through the receiver.
-  * Accepts the response message from the receiver and decodes the message
-  * struct to RunResponseMessageParams.
-  *
-  * @param  {Router} receiver.
-  * @param  {RunMessageParams} runMessageParams to be sent via a message.
-  * @return {Promise} that resolves to a RunResponseMessageParams.
-  */
-  function sendRunMessage(receiver, runMessageParams) {
-    var messageName = mojo.interfaceControl.kRunMessageId;
-    var payloadSize = mojo.interfaceControl.RunMessageParams.encodedSize;
-    // |requestID| is set to 0, but is later properly set by Router.
-    var builder = new internal.MessageV1Builder(messageName,
-        payloadSize, internal.kMessageExpectsResponse, 0);
-    builder.encodeStruct(mojo.interfaceControl.RunMessageParams,
-                         runMessageParams);
-    var message = builder.finish();
-
-    return receiver.acceptAndExpectResponse(message).then(acceptRunResponse);
-  }
-
-  function ControlMessageProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-
-  ControlMessageProxy.prototype.queryVersion = function() {
-    var runMessageParams = new mojo.interfaceControl.RunMessageParams();
-    runMessageParams.input = new mojo.interfaceControl.RunInput();
-    runMessageParams.input.queryVersion =
-        new mojo.interfaceControl.QueryVersion();
-
-    return sendRunMessage(this.receiver_, runMessageParams).then(function(
-        runResponseMessageParams) {
-      return runResponseMessageParams.output.queryVersionResult.version;
-    });
-  };
-
-  ControlMessageProxy.prototype.requireVersion = function(version) {
-    var runOrClosePipeInput = new mojo.interfaceControl.RunOrClosePipeInput();
-    runOrClosePipeInput.requireVersion =
-        new mojo.interfaceControl.RequireVersion({'version': version});
-    var message = constructRunOrClosePipeMessage(runOrClosePipeInput);
-    this.receiver_.accept(message);
-  };
-
-  internal.ControlMessageProxy = ControlMessageProxy;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  function InterfaceEndpointClient(interfaceEndpointHandle, receiver,
-      interfaceVersion) {
-    this.controller_ = null;
-    this.encounteredError_ = false;
-    this.handle_ = interfaceEndpointHandle;
-    this.incomingReceiver_ = receiver;
-
-    if (interfaceVersion !== undefined) {
-      this.controlMessageHandler_ = new internal.ControlMessageHandler(
-          interfaceVersion);
-    } else {
-      this.controlMessageProxy_ = new internal.ControlMessageProxy(this);
-    }
-
-    this.nextRequestID_ = 0;
-    this.completers_ = new Map();
-    this.payloadValidators_ = [];
-    this.connectionErrorHandler_ = null;
-
-    if (interfaceEndpointHandle.pendingAssociation()) {
-      interfaceEndpointHandle.setAssociationEventHandler(
-          this.onAssociationEvent.bind(this));
-    } else {
-      this.initControllerIfNecessary_();
-    }
-  }
-
-  InterfaceEndpointClient.prototype.initControllerIfNecessary_ = function() {
-    if (this.controller_ || this.handle_.pendingAssociation()) {
-      return;
-    }
-
-    this.controller_ = this.handle_.groupController().attachEndpointClient(
-        this.handle_, this);
-  };
-
-  InterfaceEndpointClient.prototype.onAssociationEvent = function(
-      associationEvent) {
-    if (associationEvent === internal.AssociationEvent.ASSOCIATED) {
-      this.initControllerIfNecessary_();
-    } else if (associationEvent ===
-          internal.AssociationEvent.PEER_CLOSED_BEFORE_ASSOCIATION) {
-      setTimeout(this.notifyError.bind(this, this.handle_.disconnectReason()),
-                 0);
-    }
-  };
-
-  InterfaceEndpointClient.prototype.passHandle = function() {
-    if (!this.handle_.isValid()) {
-      return new internal.InterfaceEndpointHandle();
-    }
-
-    // Used to clear the previously set callback.
-    this.handle_.setAssociationEventHandler(undefined);
-
-    if (this.controller_) {
-      this.controller_ = null;
-      this.handle_.groupController().detachEndpointClient(this.handle_);
-    }
-    var handle = this.handle_;
-    this.handle_ = null;
-    return handle;
-  };
-
-  InterfaceEndpointClient.prototype.close = function(reason) {
-    var handle = this.passHandle();
-    handle.reset(reason);
-  };
-
-  InterfaceEndpointClient.prototype.accept = function(message) {
-    if (message.associatedEndpointHandles.length > 0) {
-      message.serializeAssociatedEndpointHandles(
-          this.handle_.groupController());
-    }
-
-    if (this.encounteredError_) {
-      return false;
-    }
-
-    this.initControllerIfNecessary_();
-    return this.controller_.sendMessage(message);
-  };
-
-  InterfaceEndpointClient.prototype.acceptAndExpectResponse = function(
-      message) {
-    if (message.associatedEndpointHandles.length > 0) {
-      message.serializeAssociatedEndpointHandles(
-          this.handle_.groupController());
-    }
-
-    if (this.encounteredError_) {
-      return Promise.reject();
-    }
-
-    this.initControllerIfNecessary_();
-
-    // Reserve 0 in case we want it to convey special meaning in the future.
-    var requestID = this.nextRequestID_++;
-    if (requestID === 0)
-      requestID = this.nextRequestID_++;
-
-    message.setRequestID(requestID);
-    var result = this.controller_.sendMessage(message);
-    if (!result)
-      return Promise.reject(Error("Connection error"));
-
-    var completer = {};
-    this.completers_.set(requestID, completer);
-    return new Promise(function(resolve, reject) {
-      completer.resolve = resolve;
-      completer.reject = reject;
-    });
-  };
-
-  InterfaceEndpointClient.prototype.setPayloadValidators = function(
-      payloadValidators) {
-    this.payloadValidators_ = payloadValidators;
-  };
-
-  InterfaceEndpointClient.prototype.setIncomingReceiver = function(receiver) {
-    this.incomingReceiver_ = receiver;
-  };
-
-  InterfaceEndpointClient.prototype.setConnectionErrorHandler = function(
-      handler) {
-    this.connectionErrorHandler_ = handler;
-  };
-
-  InterfaceEndpointClient.prototype.handleIncomingMessage = function(message,
-      messageValidator) {
-    var noError = internal.validationError.NONE;
-    var err = noError;
-    for (var i = 0; err === noError && i < this.payloadValidators_.length; ++i)
-      err = this.payloadValidators_[i](messageValidator);
-
-    if (err == noError) {
-      return this.handleValidIncomingMessage_(message);
-    } else {
-      internal.reportValidationError(err);
-      return false;
-    }
-  };
-
-  InterfaceEndpointClient.prototype.handleValidIncomingMessage_ = function(
-      message) {
-    if (internal.isTestingMode()) {
-      return true;
-    }
-
-    if (this.encounteredError_) {
-      return false;
-    }
-
-    var ok = false;
-
-    if (message.expectsResponse()) {
-      if (internal.isInterfaceControlMessage(message) &&
-          this.controlMessageHandler_) {
-        ok = this.controlMessageHandler_.acceptWithResponder(message, this);
-      } else if (this.incomingReceiver_) {
-        ok = this.incomingReceiver_.acceptWithResponder(message, this);
-      }
-    } else if (message.isResponse()) {
-      var reader = new internal.MessageReader(message);
-      var requestID = reader.requestID;
-      var completer = this.completers_.get(requestID);
-      if (completer) {
-        this.completers_.delete(requestID);
-        completer.resolve(message);
-        ok = true;
-      } else {
-        console.log("Unexpected response with request ID: " + requestID);
-      }
-    } else {
-      if (internal.isInterfaceControlMessage(message) &&
-          this.controlMessageHandler_) {
-        ok = this.controlMessageHandler_.accept(message);
-      } else if (this.incomingReceiver_) {
-        ok = this.incomingReceiver_.accept(message);
-      }
-    }
-    return ok;
-  };
-
-  InterfaceEndpointClient.prototype.notifyError = function(reason) {
-    if (this.encounteredError_) {
-      return;
-    }
-    this.encounteredError_ = true;
-
-    this.completers_.forEach(function(value) {
-      value.reject();
-    });
-    this.completers_.clear();  // Drop any responders.
-
-    if (this.connectionErrorHandler_) {
-      this.connectionErrorHandler_(reason);
-    }
-  };
-
-  InterfaceEndpointClient.prototype.queryVersion = function() {
-    return this.controlMessageProxy_.queryVersion();
-  };
-
-  InterfaceEndpointClient.prototype.requireVersion = function(version) {
-    this.controlMessageProxy_.requireVersion(version);
-  };
-
-  InterfaceEndpointClient.prototype.getEncounteredError = function() {
-    return this.encounteredError_;
-  };
-
-  internal.InterfaceEndpointClient = InterfaceEndpointClient;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  var AssociationEvent = {
-    // The interface has been associated with a message pipe.
-    ASSOCIATED: 'associated',
-    // The peer of this object has been closed before association.
-    PEER_CLOSED_BEFORE_ASSOCIATION: 'peer_closed_before_association'
-  };
-
-  function State(interfaceId, associatedGroupController) {
-    if (interfaceId === undefined) {
-      interfaceId = internal.kInvalidInterfaceId;
-    }
-
-    this.interfaceId = interfaceId;
-    this.associatedGroupController = associatedGroupController;
-    this.pendingAssociation = false;
-    this.disconnectReason = null;
-    this.peerState_ = null;
-    this.associationEventHandler_ = null;
-  }
-
-  State.prototype.initPendingState = function(peer) {
-    this.pendingAssociation = true;
-    this.peerState_ = peer;
-  };
-
-  State.prototype.isValid = function() {
-    return this.pendingAssociation ||
-        internal.isValidInterfaceId(this.interfaceId);
-  };
-
-  State.prototype.close = function(disconnectReason) {
-    var cachedGroupController;
-    var cachedPeerState;
-    var cachedId = internal.kInvalidInterfaceId;
-
-    if (!this.pendingAssociation) {
-      if (internal.isValidInterfaceId(this.interfaceId)) {
-        cachedGroupController = this.associatedGroupController;
-        this.associatedGroupController = null;
-        cachedId = this.interfaceId;
-        this.interfaceId = internal.kInvalidInterfaceId;
-      }
-    } else {
-      this.pendingAssociation = false;
-      cachedPeerState = this.peerState_;
-      this.peerState_ = null;
-    }
-
-    if (cachedGroupController) {
-      cachedGroupController.closeEndpointHandle(cachedId,
-          disconnectReason);
-    } else if (cachedPeerState) {
-      cachedPeerState.onPeerClosedBeforeAssociation(disconnectReason);
-    }
-  };
-
-  State.prototype.runAssociationEventHandler = function(associationEvent) {
-    if (this.associationEventHandler_) {
-      var handler = this.associationEventHandler_;
-      this.associationEventHandler_ = null;
-      handler(associationEvent);
-    }
-  };
-
-  State.prototype.setAssociationEventHandler = function(handler) {
-    if (!this.pendingAssociation &&
-        !internal.isValidInterfaceId(this.interfaceId)) {
-      return;
-    }
-
-    if (!handler) {
-      this.associationEventHandler_ = null;
-      return;
-    }
-
-    this.associationEventHandler_ = handler;
-    if (!this.pendingAssociation) {
-      setTimeout(this.runAssociationEventHandler.bind(this,
-          AssociationEvent.ASSOCIATED), 0);
-    } else if (!this.peerState_) {
-      setTimeout(this.runAssociationEventHandler.bind(this,
-          AssociationEvent.PEER_CLOSED_BEFORE_ASSOCIATION), 0);
-    }
-  };
-
-  State.prototype.notifyAssociation = function(interfaceId,
-                                               peerGroupController) {
-    var cachedPeerState = this.peerState_;
-    this.peerState_ = null;
-
-    this.pendingAssociation = false;
-
-    if (cachedPeerState) {
-      cachedPeerState.onAssociated(interfaceId, peerGroupController);
-      return true;
-    }
-    return false;
-  };
-
-  State.prototype.onAssociated = function(interfaceId,
-      associatedGroupController) {
-    if (!this.pendingAssociation) {
-      return;
-    }
-
-    this.pendingAssociation = false;
-    this.peerState_ = null;
-    this.interfaceId = interfaceId;
-    this.associatedGroupController = associatedGroupController;
-    this.runAssociationEventHandler(AssociationEvent.ASSOCIATED);
-  };
-
-  State.prototype.onPeerClosedBeforeAssociation = function(disconnectReason) {
-    if (!this.pendingAssociation) {
-      return;
-    }
-
-    this.peerState_ = null;
-    this.disconnectReason = disconnectReason;
-
-    this.runAssociationEventHandler(
-        AssociationEvent.PEER_CLOSED_BEFORE_ASSOCIATION);
-  };
-
-  function createPairPendingAssociation() {
-    var handle0 = new InterfaceEndpointHandle();
-    var handle1 = new InterfaceEndpointHandle();
-    handle0.state_.initPendingState(handle1.state_);
-    handle1.state_.initPendingState(handle0.state_);
-    return {handle0: handle0, handle1: handle1};
-  }
-
-  function InterfaceEndpointHandle(interfaceId, associatedGroupController) {
-    this.state_ = new State(interfaceId, associatedGroupController);
-  }
-
-  InterfaceEndpointHandle.prototype.isValid = function() {
-    return this.state_.isValid();
-  };
-
-  InterfaceEndpointHandle.prototype.pendingAssociation = function() {
-    return this.state_.pendingAssociation;
-  };
-
-  InterfaceEndpointHandle.prototype.id = function() {
-    return this.state_.interfaceId;
-  };
-
-  InterfaceEndpointHandle.prototype.groupController = function() {
-    return this.state_.associatedGroupController;
-  };
-
-  InterfaceEndpointHandle.prototype.disconnectReason = function() {
-    return this.state_.disconnectReason;
-  };
-
-  InterfaceEndpointHandle.prototype.setAssociationEventHandler = function(
-      handler) {
-    this.state_.setAssociationEventHandler(handler);
-  };
-
-  InterfaceEndpointHandle.prototype.notifyAssociation = function(interfaceId,
-      peerGroupController) {
-    return this.state_.notifyAssociation(interfaceId, peerGroupController);
-  };
-
-  InterfaceEndpointHandle.prototype.reset = function(reason) {
-    this.state_.close(reason);
-    this.state_ = new State();
-  };
-
-  internal.AssociationEvent = AssociationEvent;
-  internal.InterfaceEndpointHandle = InterfaceEndpointHandle;
-  internal.createPairPendingAssociation = createPairPendingAssociation;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  function validateControlRequestWithoutResponse(message) {
-    var messageValidator = new internal.Validator(message);
-    var error = messageValidator.validateMessageIsRequestWithoutResponse();
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-
-    if (message.getName() != mojo.pipeControl.kRunOrClosePipeMessageId) {
-      throw new Error("Control message name is not kRunOrClosePipeMessageId");
-    }
-
-    // Validate payload.
-    error = mojo.pipeControl.RunOrClosePipeMessageParams.validate(
-        messageValidator, message.getHeaderNumBytes());
-    if (error != internal.validationError.NONE) {
-      throw error;
-    }
-  }
-
-  function runOrClosePipe(message, delegate) {
-    var reader = new internal.MessageReader(message);
-    var runOrClosePipeMessageParams = reader.decodeStruct(
-        mojo.pipeControl.RunOrClosePipeMessageParams);
-    var event = runOrClosePipeMessageParams.input
-        .peerAssociatedEndpointClosedEvent;
-    return delegate.onPeerAssociatedEndpointClosed(event.id,
-        event.disconnectReason);
-  }
-
-  function isPipeControlMessage(message) {
-    return !internal.isValidInterfaceId(message.getInterfaceId());
-  }
-
-  function PipeControlMessageHandler(delegate) {
-    this.delegate_ = delegate;
-  }
-
-  PipeControlMessageHandler.prototype.accept = function(message) {
-    validateControlRequestWithoutResponse(message);
-    return runOrClosePipe(message, this.delegate_);
-  };
-
-  internal.PipeControlMessageHandler = PipeControlMessageHandler;
-  internal.isPipeControlMessage = isPipeControlMessage;
-})();
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  function constructRunOrClosePipeMessage(runOrClosePipeInput) {
-    var runOrClosePipeMessageParams = new
-        mojo.pipeControl.RunOrClosePipeMessageParams();
-    runOrClosePipeMessageParams.input = runOrClosePipeInput;
-
-    var messageName = mojo.pipeControl.kRunOrClosePipeMessageId;
-    var payloadSize =
-        mojo.pipeControl.RunOrClosePipeMessageParams.encodedSize;
-
-    var builder = new internal.MessageV0Builder(messageName, payloadSize);
-    builder.encodeStruct(mojo.pipeControl.RunOrClosePipeMessageParams,
-                         runOrClosePipeMessageParams);
-    var message = builder.finish();
-    message.setInterfaceId(internal.kInvalidInterfaceId);
-    return message;
-  }
-
-  function PipeControlMessageProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-
-  PipeControlMessageProxy.prototype.notifyPeerEndpointClosed = function(
-      interfaceId, reason) {
-    var message = this.constructPeerEndpointClosedMessage(interfaceId, reason);
-    this.receiver_.accept(message);
-  };
-
-  PipeControlMessageProxy.prototype.constructPeerEndpointClosedMessage =
-      function(interfaceId, reason) {
-    var event = new mojo.pipeControl.PeerAssociatedEndpointClosedEvent();
-    event.id = interfaceId;
-    if (reason) {
-      event.disconnectReason = new mojo.pipeControl.DisconnectReason({
-          customReason: reason.customReason,
-          description: reason.description});
-    }
-    var runOrClosePipeInput = new mojo.pipeControl.RunOrClosePipeInput();
-    runOrClosePipeInput.peerAssociatedEndpointClosedEvent = event;
-    return constructRunOrClosePipeMessage(runOrClosePipeInput);
-  };
-
-  internal.PipeControlMessageProxy = PipeControlMessageProxy;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  /**
-   * The state of |endpoint|. If both the endpoint and its peer have been
-   * closed, removes it from |endpoints_|.
-   * @enum {string}
-   */
-  var EndpointStateUpdateType = {
-    ENDPOINT_CLOSED: 'endpoint_closed',
-    PEER_ENDPOINT_CLOSED: 'peer_endpoint_closed'
-  };
-
-  function check(condition, output) {
-    if (!condition) {
-      // testharness.js does not rethrow errors so the error stack needs to be
-      // included as a string in the error we throw for debugging layout tests.
-      throw new Error((new Error()).stack);
-    }
-  }
-
-  function InterfaceEndpoint(router, interfaceId) {
-    this.router_ = router;
-    this.id = interfaceId;
-    this.closed = false;
-    this.peerClosed = false;
-    this.handleCreated = false;
-    this.disconnectReason = null;
-    this.client = null;
-  }
-
-  InterfaceEndpoint.prototype.sendMessage = function(message) {
-    message.setInterfaceId(this.id);
-    return this.router_.connector_.accept(message);
-  };
-
-  function Router(handle, setInterfaceIdNamespaceBit) {
-    if (!(handle instanceof MojoHandle)) {
-      throw new Error("Router constructor: Not a handle");
-    }
-    if (setInterfaceIdNamespaceBit === undefined) {
-      setInterfaceIdNamespaceBit = false;
-    }
-
-    this.connector_ = new internal.Connector(handle);
-
-    this.connector_.setIncomingReceiver({
-        accept: this.accept.bind(this),
-    });
-    this.connector_.setErrorHandler({
-        onError: this.onPipeConnectionError.bind(this),
-    });
-
-    this.setInterfaceIdNamespaceBit_ = setInterfaceIdNamespaceBit;
-    // |cachedMessageData| caches infomation about a message, so it can be
-    // processed later if a client is not yet attached to the target endpoint.
-    this.cachedMessageData = null;
-    this.controlMessageHandler_ = new internal.PipeControlMessageHandler(this);
-    this.controlMessageProxy_ =
-        new internal.PipeControlMessageProxy(this.connector_);
-    this.nextInterfaceIdValue_ = 1;
-    this.encounteredError_ = false;
-    this.endpoints_ = new Map();
-  }
-
-  Router.prototype.associateInterface = function(handleToSend) {
-    if (!handleToSend.pendingAssociation()) {
-      return internal.kInvalidInterfaceId;
-    }
-
-    var id = 0;
-    do {
-      if (this.nextInterfaceIdValue_ >= internal.kInterfaceIdNamespaceMask) {
-        this.nextInterfaceIdValue_ = 1;
-      }
-      id = this.nextInterfaceIdValue_++;
-      if (this.setInterfaceIdNamespaceBit_) {
-        id += internal.kInterfaceIdNamespaceMask;
-      }
-    } while (this.endpoints_.has(id));
-
-    var endpoint = new InterfaceEndpoint(this, id);
-    this.endpoints_.set(id, endpoint);
-    if (this.encounteredError_) {
-      this.updateEndpointStateMayRemove(endpoint,
-          EndpointStateUpdateType.PEER_ENDPOINT_CLOSED);
-    }
-    endpoint.handleCreated = true;
-
-    if (!handleToSend.notifyAssociation(id, this)) {
-      // The peer handle of |handleToSend|, which is supposed to join this
-      // associated group, has been closed.
-      this.updateEndpointStateMayRemove(endpoint,
-          EndpointStateUpdateType.ENDPOINT_CLOSED);
-
-      pipeControlMessageproxy.notifyPeerEndpointClosed(id,
-          handleToSend.disconnectReason());
-    }
-
-    return id;
-  };
-
-  Router.prototype.attachEndpointClient = function(
-      interfaceEndpointHandle, interfaceEndpointClient) {
-    check(internal.isValidInterfaceId(interfaceEndpointHandle.id()));
-    check(interfaceEndpointClient);
-
-    var endpoint = this.endpoints_.get(interfaceEndpointHandle.id());
-    check(endpoint);
-    check(!endpoint.client);
-    check(!endpoint.closed);
-    endpoint.client = interfaceEndpointClient;
-
-    if (endpoint.peerClosed) {
-      setTimeout(endpoint.client.notifyError.bind(endpoint.client), 0);
-    }
-
-    if (this.cachedMessageData && interfaceEndpointHandle.id() ===
-        this.cachedMessageData.message.getInterfaceId()) {
-      setTimeout((function() {
-        if (!this.cachedMessageData) {
-          return;
-        }
-
-        var targetEndpoint = this.endpoints_.get(
-            this.cachedMessageData.message.getInterfaceId());
-        // Check that the target endpoint's client still exists.
-        if (targetEndpoint && targetEndpoint.client) {
-          var message = this.cachedMessageData.message;
-          var messageValidator = this.cachedMessageData.messageValidator;
-          this.cachedMessageData = null;
-          this.connector_.resumeIncomingMethodCallProcessing();
-          var ok = endpoint.client.handleIncomingMessage(message,
-              messageValidator);
-
-          // Handle invalid cached incoming message.
-          if (!internal.isTestingMode() && !ok) {
-            this.connector_.handleError(true, true);
-          }
-        }
-      }).bind(this), 0);
-    }
-
-    return endpoint;
-  };
-
-  Router.prototype.detachEndpointClient = function(
-      interfaceEndpointHandle) {
-    check(internal.isValidInterfaceId(interfaceEndpointHandle.id()));
-    var endpoint = this.endpoints_.get(interfaceEndpointHandle.id());
-    check(endpoint);
-    check(endpoint.client);
-    check(!endpoint.closed);
-
-    endpoint.client = null;
-  };
-
-  Router.prototype.createLocalEndpointHandle = function(
-      interfaceId) {
-    if (!internal.isValidInterfaceId(interfaceId)) {
-      return new internal.InterfaceEndpointHandle();
-    }
-
-    // Unless it is the master ID, |interfaceId| is from the remote side and
-    // therefore its namespace bit is supposed to be different than the value
-    // that this router would use.
-    if (!internal.isMasterInterfaceId(interfaceId) &&
-        this.setInterfaceIdNamespaceBit_ ===
-            internal.hasInterfaceIdNamespaceBitSet(interfaceId)) {
-      return new internal.InterfaceEndpointHandle();
-    }
-
-    var endpoint = this.endpoints_.get(interfaceId);
-
-    if (!endpoint) {
-      endpoint = new InterfaceEndpoint(this, interfaceId);
-      this.endpoints_.set(interfaceId, endpoint);
-
-      check(!endpoint.handleCreated);
-
-      if (this.encounteredError_) {
-        this.updateEndpointStateMayRemove(endpoint,
-            EndpointStateUpdateType.PEER_ENDPOINT_CLOSED);
-      }
-    } else {
-      // If the endpoint already exist, it is because we have received a
-      // notification that the peer endpoint has closed.
-      check(!endpoint.closed);
-      check(endpoint.peerClosed);
-
-      if (endpoint.handleCreated) {
-        return new internal.InterfaceEndpointHandle();
-      }
-    }
-
-    endpoint.handleCreated = true;
-    return new internal.InterfaceEndpointHandle(interfaceId, this);
-  };
-
-  Router.prototype.accept = function(message) {
-    var messageValidator = new internal.Validator(message);
-    var err = messageValidator.validateMessageHeader();
-
-    var ok = false;
-    if (err !== internal.validationError.NONE) {
-      internal.reportValidationError(err);
-    } else if (message.deserializeAssociatedEndpointHandles(this)) {
-      if (internal.isPipeControlMessage(message)) {
-        ok = this.controlMessageHandler_.accept(message);
-      } else {
-        var interfaceId = message.getInterfaceId();
-        var endpoint = this.endpoints_.get(interfaceId);
-        if (!endpoint || endpoint.closed) {
-          return true;
-        }
-
-        if (!endpoint.client) {
-          // We need to wait until a client is attached in order to dispatch
-          // further messages.
-          this.cachedMessageData = {message: message,
-              messageValidator: messageValidator};
-          this.connector_.pauseIncomingMethodCallProcessing();
-          return true;
-        }
-        ok = endpoint.client.handleIncomingMessage(message, messageValidator);
-      }
-    }
-    return ok;
-  };
-
-  Router.prototype.close = function() {
-    this.connector_.close();
-    // Closing the message pipe won't trigger connection error handler.
-    // Explicitly call onPipeConnectionError() so that associated endpoints
-    // will get notified.
-    this.onPipeConnectionError();
-  };
-
-  Router.prototype.onPeerAssociatedEndpointClosed = function(interfaceId,
-      reason) {
-    var endpoint = this.endpoints_.get(interfaceId);
-    if (!endpoint) {
-      endpoint = new InterfaceEndpoint(this, interfaceId);
-      this.endpoints_.set(interfaceId, endpoint);
-    }
-
-    if (reason) {
-      endpoint.disconnectReason = reason;
-    }
-
-    if (!endpoint.peerClosed) {
-      if (endpoint.client) {
-        setTimeout(endpoint.client.notifyError.bind(endpoint.client, reason),
-                   0);
-      }
-      this.updateEndpointStateMayRemove(endpoint,
-          EndpointStateUpdateType.PEER_ENDPOINT_CLOSED);
-    }
-    return true;
-  };
-
-  Router.prototype.onPipeConnectionError = function() {
-    this.encounteredError_ = true;
-
-    for (var endpoint of this.endpoints_.values()) {
-      if (endpoint.client) {
-        setTimeout(
-            endpoint.client.notifyError.bind(
-                endpoint.client, endpoint.disconnectReason),
-            0);
-      }
-      this.updateEndpointStateMayRemove(endpoint,
-          EndpointStateUpdateType.PEER_ENDPOINT_CLOSED);
-    }
-  };
-
-  Router.prototype.closeEndpointHandle = function(interfaceId, reason) {
-    if (!internal.isValidInterfaceId(interfaceId)) {
-      return;
-    }
-    var endpoint = this.endpoints_.get(interfaceId);
-    check(endpoint);
-    check(!endpoint.client);
-    check(!endpoint.closed);
-
-    this.updateEndpointStateMayRemove(endpoint,
-        EndpointStateUpdateType.ENDPOINT_CLOSED);
-
-    if (!internal.isMasterInterfaceId(interfaceId) || reason) {
-      this.controlMessageProxy_.notifyPeerEndpointClosed(interfaceId, reason);
-    }
-
-    if (this.cachedMessageData && interfaceId ===
-        this.cachedMessageData.message.getInterfaceId()) {
-      this.cachedMessageData = null;
-      this.connector_.resumeIncomingMethodCallProcessing();
-    }
-  };
-
-  Router.prototype.updateEndpointStateMayRemove = function(endpoint,
-      endpointStateUpdateType) {
-    if (endpointStateUpdateType === EndpointStateUpdateType.ENDPOINT_CLOSED) {
-      endpoint.closed = true;
-    } else {
-      endpoint.peerClosed = true;
-    }
-    if (endpoint.closed && endpoint.peerClosed) {
-      this.endpoints_.delete(endpoint.id);
-    }
-  };
-
-  internal.Router = Router;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-/**
- * Defines functions for translating between JavaScript strings and UTF8 strings
- * stored in ArrayBuffers. There is much room for optimization in this code if
- * it proves necessary.
- */
-(function() {
-  var internal = mojo.internal;
-  var textDecoder = new TextDecoder('utf-8');
-  var textEncoder = new TextEncoder('utf-8');
-
-  /**
-   * Decodes the UTF8 string from the given buffer.
-   * @param {ArrayBufferView} buffer The buffer containing UTF8 string data.
-   * @return {string} The corresponding JavaScript string.
-   */
-  function decodeUtf8String(buffer) {
-    return textDecoder.decode(buffer);
-  }
-
-  /**
-   * Encodes the given JavaScript string into UTF8.
-   * @param {string} str The string to encode.
-   * @param {ArrayBufferView} outputBuffer The buffer to contain the result.
-   * Should be pre-allocated to hold enough space. Use |utf8Length| to determine
-   * how much space is required.
-   * @return {number} The number of bytes written to |outputBuffer|.
-   */
-  function encodeUtf8String(str, outputBuffer) {
-    const utf8Buffer = textEncoder.encode(str);
-    if (outputBuffer.length < utf8Buffer.length)
-      throw new Error("Buffer too small for encodeUtf8String");
-    outputBuffer.set(utf8Buffer);
-    return utf8Buffer.length;
-  }
-
-  /**
-   * Returns the number of bytes that a UTF8 encoding of the JavaScript string
-   * |str| would occupy.
-   */
-  function utf8Length(str) {
-    return textEncoder.encode(str).length;
-  }
-
-  internal.decodeUtf8String = decodeUtf8String;
-  internal.encodeUtf8String = encodeUtf8String;
-  internal.utf8Length = utf8Length;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-(function() {
-  var internal = mojo.internal;
-
-  var validationError = {
-    NONE: 'VALIDATION_ERROR_NONE',
-    MISALIGNED_OBJECT: 'VALIDATION_ERROR_MISALIGNED_OBJECT',
-    ILLEGAL_MEMORY_RANGE: 'VALIDATION_ERROR_ILLEGAL_MEMORY_RANGE',
-    UNEXPECTED_STRUCT_HEADER: 'VALIDATION_ERROR_UNEXPECTED_STRUCT_HEADER',
-    UNEXPECTED_ARRAY_HEADER: 'VALIDATION_ERROR_UNEXPECTED_ARRAY_HEADER',
-    ILLEGAL_HANDLE: 'VALIDATION_ERROR_ILLEGAL_HANDLE',
-    UNEXPECTED_INVALID_HANDLE: 'VALIDATION_ERROR_UNEXPECTED_INVALID_HANDLE',
-    ILLEGAL_POINTER: 'VALIDATION_ERROR_ILLEGAL_POINTER',
-    UNEXPECTED_NULL_POINTER: 'VALIDATION_ERROR_UNEXPECTED_NULL_POINTER',
-    ILLEGAL_INTERFACE_ID: 'VALIDATION_ERROR_ILLEGAL_INTERFACE_ID',
-    UNEXPECTED_INVALID_INTERFACE_ID:
-        'VALIDATION_ERROR_UNEXPECTED_INVALID_INTERFACE_ID',
-    MESSAGE_HEADER_INVALID_FLAGS:
-        'VALIDATION_ERROR_MESSAGE_HEADER_INVALID_FLAGS',
-    MESSAGE_HEADER_MISSING_REQUEST_ID:
-        'VALIDATION_ERROR_MESSAGE_HEADER_MISSING_REQUEST_ID',
-    DIFFERENT_SIZED_ARRAYS_IN_MAP:
-        'VALIDATION_ERROR_DIFFERENT_SIZED_ARRAYS_IN_MAP',
-    INVALID_UNION_SIZE: 'VALIDATION_ERROR_INVALID_UNION_SIZE',
-    UNEXPECTED_NULL_UNION: 'VALIDATION_ERROR_UNEXPECTED_NULL_UNION',
-    UNKNOWN_ENUM_VALUE: 'VALIDATION_ERROR_UNKNOWN_ENUM_VALUE',
-  };
-
-  var NULL_MOJO_POINTER = "NULL_MOJO_POINTER";
-  var gValidationErrorObserver = null;
-
-  function reportValidationError(error) {
-    if (gValidationErrorObserver) {
-      gValidationErrorObserver.lastError = error;
-    } else {
-      console.warn('Invalid message: ' + error);
-    }
-  }
-
-  var ValidationErrorObserverForTesting = (function() {
-    function Observer() {
-      this.lastError = validationError.NONE;
-    }
-
-    Observer.prototype.reset = function() {
-      this.lastError = validationError.NONE;
-    };
-
-    return {
-      getInstance: function() {
-        if (!gValidationErrorObserver) {
-          gValidationErrorObserver = new Observer();
-        }
-        return gValidationErrorObserver;
-      }
-    };
-  })();
-
-  function isTestingMode() {
-    return Boolean(gValidationErrorObserver);
-  }
-
-  function clearTestingMode() {
-    gValidationErrorObserver = null;
-  }
-
-  function isEnumClass(cls) {
-    return cls instanceof internal.Enum;
-  }
-
-  function isStringClass(cls) {
-    return cls === internal.String || cls === internal.NullableString;
-  }
-
-  function isHandleClass(cls) {
-    return cls === internal.Handle || cls === internal.NullableHandle;
-  }
-
-  function isInterfaceClass(cls) {
-    return cls instanceof internal.Interface;
-  }
-
-  function isInterfaceRequestClass(cls) {
-    return cls === internal.InterfaceRequest ||
-        cls === internal.NullableInterfaceRequest;
-  }
-
-  function isAssociatedInterfaceClass(cls) {
-    return cls === internal.AssociatedInterfacePtrInfo ||
-        cls === internal.NullableAssociatedInterfacePtrInfo;
-  }
-
-  function isAssociatedInterfaceRequestClass(cls) {
-    return cls === internal.AssociatedInterfaceRequest ||
-        cls === internal.NullableAssociatedInterfaceRequest;
-  }
-
-  function isNullable(type) {
-    return type === internal.NullableString ||
-        type === internal.NullableHandle ||
-        type === internal.NullableAssociatedInterfacePtrInfo ||
-        type === internal.NullableAssociatedInterfaceRequest ||
-        type === internal.NullableInterface ||
-        type === internal.NullableInterfaceRequest ||
-        type instanceof internal.NullableArrayOf ||
-        type instanceof internal.NullablePointerTo;
-  }
-
-  function Validator(message) {
-    this.message = message;
-    this.offset = 0;
-    this.handleIndex = 0;
-    this.associatedEndpointHandleIndex = 0;
-    this.payloadInterfaceIds = null;
-    this.offsetLimit = this.message.buffer.byteLength;
-  }
-
-  Object.defineProperty(Validator.prototype, "handleIndexLimit", {
-    get: function() { return this.message.handles.length; }
-  });
-
-  Object.defineProperty(Validator.prototype, "associatedHandleIndexLimit", {
-    get: function() {
-      return this.payloadInterfaceIds ? this.payloadInterfaceIds.length : 0;
-    }
-  });
-
-  // True if we can safely allocate a block of bytes from start to
-  // to start + numBytes.
-  Validator.prototype.isValidRange = function(start, numBytes) {
-    // Only positive JavaScript integers that are less than 2^53
-    // (Number.MAX_SAFE_INTEGER) can be represented exactly.
-    if (start < this.offset || numBytes <= 0 ||
-        !Number.isSafeInteger(start) ||
-        !Number.isSafeInteger(numBytes))
-      return false;
-
-    var newOffset = start + numBytes;
-    if (!Number.isSafeInteger(newOffset) || newOffset > this.offsetLimit)
-      return false;
-
-    return true;
-  };
-
-  Validator.prototype.claimRange = function(start, numBytes) {
-    if (this.isValidRange(start, numBytes)) {
-      this.offset = start + numBytes;
-      return true;
-    }
-    return false;
-  };
-
-  Validator.prototype.claimHandle = function(index) {
-    if (index === internal.kEncodedInvalidHandleValue)
-      return true;
-
-    if (index < this.handleIndex || index >= this.handleIndexLimit)
-      return false;
-
-    // This is safe because handle indices are uint32.
-    this.handleIndex = index + 1;
-    return true;
-  };
-
-  Validator.prototype.claimAssociatedEndpointHandle = function(index) {
-    if (index === internal.kEncodedInvalidHandleValue) {
-      return true;
-    }
-
-    if (index < this.associatedEndpointHandleIndex ||
-        index >= this.associatedHandleIndexLimit) {
-      return false;
-    }
-
-    // This is safe because handle indices are uint32.
-    this.associatedEndpointHandleIndex = index + 1;
-    return true;
-  };
-
-  Validator.prototype.validateEnum = function(offset, enumClass) {
-    // Note: Assumes that enums are always 32 bits! But this matches
-    // mojom::generate::pack::PackedField::GetSizeForKind, so it should be okay.
-    var value = this.message.buffer.getInt32(offset);
-    return enumClass.validate(value);
-  }
-
-  Validator.prototype.validateHandle = function(offset, nullable) {
-    var index = this.message.buffer.getUint32(offset);
-
-    if (index === internal.kEncodedInvalidHandleValue)
-      return nullable ?
-          validationError.NONE : validationError.UNEXPECTED_INVALID_HANDLE;
-
-    if (!this.claimHandle(index))
-      return validationError.ILLEGAL_HANDLE;
-
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateAssociatedEndpointHandle = function(offset,
-      nullable) {
-    var index = this.message.buffer.getUint32(offset);
-
-    if (index === internal.kEncodedInvalidHandleValue) {
-      return nullable ? validationError.NONE :
-          validationError.UNEXPECTED_INVALID_INTERFACE_ID;
-    }
-
-    if (!this.claimAssociatedEndpointHandle(index)) {
-      return validationError.ILLEGAL_INTERFACE_ID;
-    }
-
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateInterface = function(offset, nullable) {
-    return this.validateHandle(offset, nullable);
-  };
-
-  Validator.prototype.validateInterfaceRequest = function(offset, nullable) {
-    return this.validateHandle(offset, nullable);
-  };
-
-  Validator.prototype.validateAssociatedInterface = function(offset,
-      nullable) {
-    return this.validateAssociatedEndpointHandle(offset, nullable);
-  };
-
-  Validator.prototype.validateAssociatedInterfaceRequest = function(
-      offset, nullable) {
-    return this.validateAssociatedEndpointHandle(offset, nullable);
-  };
-
-  Validator.prototype.validateStructHeader = function(offset, minNumBytes) {
-    if (!internal.isAligned(offset))
-      return validationError.MISALIGNED_OBJECT;
-
-    if (!this.isValidRange(offset, internal.kStructHeaderSize))
-      return validationError.ILLEGAL_MEMORY_RANGE;
-
-    var numBytes = this.message.buffer.getUint32(offset);
-
-    if (numBytes < minNumBytes)
-      return validationError.UNEXPECTED_STRUCT_HEADER;
-
-    if (!this.claimRange(offset, numBytes))
-      return validationError.ILLEGAL_MEMORY_RANGE;
-
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateStructVersion = function(offset, versionSizes) {
-    var numBytes = this.message.buffer.getUint32(offset);
-    var version = this.message.buffer.getUint32(offset + 4);
-
-    if (version <= versionSizes[versionSizes.length - 1].version) {
-      // Scan in reverse order to optimize for more recent versionSizes.
-      for (var i = versionSizes.length - 1; i >= 0; --i) {
-        if (version >= versionSizes[i].version) {
-          if (numBytes == versionSizes[i].numBytes)
-            break;
-          return validationError.UNEXPECTED_STRUCT_HEADER;
-        }
-      }
-    } else if (numBytes < versionSizes[versionSizes.length-1].numBytes) {
-      return validationError.UNEXPECTED_STRUCT_HEADER;
-    }
-
-    return validationError.NONE;
-  };
-
-  Validator.prototype.isFieldInStructVersion = function(offset, fieldVersion) {
-    var structVersion = this.message.buffer.getUint32(offset + 4);
-    return fieldVersion <= structVersion;
-  };
-
-  Validator.prototype.validateMessageHeader = function() {
-    var err = this.validateStructHeader(0, internal.kMessageV0HeaderSize);
-    if (err != validationError.NONE) {
-      return err;
-    }
-
-    var numBytes = this.message.getHeaderNumBytes();
-    var version = this.message.getHeaderVersion();
-
-    var validVersionAndNumBytes =
-        (version == 0 && numBytes == internal.kMessageV0HeaderSize) ||
-        (version == 1 && numBytes == internal.kMessageV1HeaderSize) ||
-        (version == 2 && numBytes == internal.kMessageV2HeaderSize) ||
-        (version > 2 && numBytes >= internal.kMessageV2HeaderSize);
-
-    if (!validVersionAndNumBytes) {
-      return validationError.UNEXPECTED_STRUCT_HEADER;
-    }
-
-    var expectsResponse = this.message.expectsResponse();
-    var isResponse = this.message.isResponse();
-
-    if (version == 0 && (expectsResponse || isResponse)) {
-      return validationError.MESSAGE_HEADER_MISSING_REQUEST_ID;
-    }
-
-    if (isResponse && expectsResponse) {
-      return validationError.MESSAGE_HEADER_INVALID_FLAGS;
-    }
-
-    if (version < 2) {
-      return validationError.NONE;
-    }
-
-    var err = this.validateArrayPointer(
-        internal.kMessagePayloadInterfaceIdsPointerOffset,
-        internal.Uint32.encodedSize, internal.Uint32, true, [0], 0);
-
-    if (err != validationError.NONE) {
-      return err;
-    }
-
-    this.payloadInterfaceIds = this.message.getPayloadInterfaceIds();
-    if (this.payloadInterfaceIds) {
-      for (var interfaceId of this.payloadInterfaceIds) {
-        if (!internal.isValidInterfaceId(interfaceId) ||
-            internal.isMasterInterfaceId(interfaceId)) {
-          return validationError.ILLEGAL_INTERFACE_ID;
-        }
-      }
-    }
-
-    // Set offset to the start of the payload and offsetLimit to the start of
-    // the payload interface Ids so that payload can be validated using the
-    // same messageValidator.
-    this.offset = this.message.getHeaderNumBytes();
-    this.offsetLimit = this.decodePointer(
-        internal.kMessagePayloadInterfaceIdsPointerOffset);
-
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateMessageIsRequestWithoutResponse = function() {
-    if (this.message.isResponse() || this.message.expectsResponse()) {
-      return validationError.MESSAGE_HEADER_INVALID_FLAGS;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateMessageIsRequestExpectingResponse = function() {
-    if (this.message.isResponse() || !this.message.expectsResponse()) {
-      return validationError.MESSAGE_HEADER_INVALID_FLAGS;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateMessageIsResponse = function() {
-    if (this.message.expectsResponse() || !this.message.isResponse()) {
-      return validationError.MESSAGE_HEADER_INVALID_FLAGS;
-    }
-    return validationError.NONE;
-  };
-
-  // Returns the message.buffer relative offset this pointer "points to",
-  // NULL_MOJO_POINTER if the pointer represents a null, or JS null if the
-  // pointer's value is not valid.
-  Validator.prototype.decodePointer = function(offset) {
-    var pointerValue = this.message.buffer.getUint64(offset);
-    if (pointerValue === 0)
-      return NULL_MOJO_POINTER;
-    var bufferOffset = offset + pointerValue;
-    return Number.isSafeInteger(bufferOffset) ? bufferOffset : null;
-  };
-
-  Validator.prototype.decodeUnionSize = function(offset) {
-    return this.message.buffer.getUint32(offset);
-  };
-
-  Validator.prototype.decodeUnionTag = function(offset) {
-    return this.message.buffer.getUint32(offset + 4);
-  };
-
-  Validator.prototype.validateArrayPointer = function(
-      offset, elementSize, elementType, nullable, expectedDimensionSizes,
-      currentDimension) {
-    var arrayOffset = this.decodePointer(offset);
-    if (arrayOffset === null)
-      return validationError.ILLEGAL_POINTER;
-
-    if (arrayOffset === NULL_MOJO_POINTER)
-      return nullable ?
-          validationError.NONE : validationError.UNEXPECTED_NULL_POINTER;
-
-    return this.validateArray(arrayOffset, elementSize, elementType,
-                              expectedDimensionSizes, currentDimension);
-  };
-
-  Validator.prototype.validateStructPointer = function(
-      offset, structClass, nullable) {
-    var structOffset = this.decodePointer(offset);
-    if (structOffset === null)
-      return validationError.ILLEGAL_POINTER;
-
-    if (structOffset === NULL_MOJO_POINTER)
-      return nullable ?
-          validationError.NONE : validationError.UNEXPECTED_NULL_POINTER;
-
-    return structClass.validate(this, structOffset);
-  };
-
-  Validator.prototype.validateUnion = function(
-      offset, unionClass, nullable) {
-    var size = this.message.buffer.getUint32(offset);
-    if (size == 0) {
-      return nullable ?
-          validationError.NONE : validationError.UNEXPECTED_NULL_UNION;
-    }
-
-    return unionClass.validate(this, offset);
-  };
-
-  Validator.prototype.validateNestedUnion = function(
-      offset, unionClass, nullable) {
-    var unionOffset = this.decodePointer(offset);
-    if (unionOffset === null)
-      return validationError.ILLEGAL_POINTER;
-
-    if (unionOffset === NULL_MOJO_POINTER)
-      return nullable ?
-          validationError.NONE : validationError.UNEXPECTED_NULL_UNION;
-
-    return this.validateUnion(unionOffset, unionClass, nullable);
-  };
-
-  // This method assumes that the array at arrayPointerOffset has
-  // been validated.
-
-  Validator.prototype.arrayLength = function(arrayPointerOffset) {
-    var arrayOffset = this.decodePointer(arrayPointerOffset);
-    return this.message.buffer.getUint32(arrayOffset + 4);
-  };
-
-  Validator.prototype.validateMapPointer = function(
-      offset, mapIsNullable, keyClass, valueClass, valueIsNullable) {
-    // Validate the implicit map struct:
-    // struct {array<keyClass> keys; array<valueClass> values};
-    var structOffset = this.decodePointer(offset);
-    if (structOffset === null)
-      return validationError.ILLEGAL_POINTER;
-
-    if (structOffset === NULL_MOJO_POINTER)
-      return mapIsNullable ?
-          validationError.NONE : validationError.UNEXPECTED_NULL_POINTER;
-
-    var mapEncodedSize = internal.kStructHeaderSize +
-                         internal.kMapStructPayloadSize;
-    var err = this.validateStructHeader(structOffset, mapEncodedSize);
-    if (err !== validationError.NONE)
-        return err;
-
-    // Validate the keys array.
-    var keysArrayPointerOffset = structOffset + internal.kStructHeaderSize;
-    err = this.validateArrayPointer(
-        keysArrayPointerOffset, keyClass.encodedSize, keyClass, false, [0], 0);
-    if (err !== validationError.NONE)
-        return err;
-
-    // Validate the values array.
-    var valuesArrayPointerOffset = keysArrayPointerOffset + 8;
-    var valuesArrayDimensions = [0]; // Validate the actual length below.
-    if (valueClass instanceof internal.ArrayOf)
-      valuesArrayDimensions =
-          valuesArrayDimensions.concat(valueClass.dimensions());
-    var err = this.validateArrayPointer(valuesArrayPointerOffset,
-                                        valueClass.encodedSize,
-                                        valueClass,
-                                        valueIsNullable,
-                                        valuesArrayDimensions,
-                                        0);
-    if (err !== validationError.NONE)
-        return err;
-
-    // Validate the lengths of the keys and values arrays.
-    var keysArrayLength = this.arrayLength(keysArrayPointerOffset);
-    var valuesArrayLength = this.arrayLength(valuesArrayPointerOffset);
-    if (keysArrayLength != valuesArrayLength)
-      return validationError.DIFFERENT_SIZED_ARRAYS_IN_MAP;
-
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateStringPointer = function(offset, nullable) {
-    return this.validateArrayPointer(
-        offset, internal.Uint8.encodedSize, internal.Uint8, nullable, [0], 0);
-  };
-
-  // Similar to Array_Data<T>::Validate()
-  // mojo/public/cpp/bindings/lib/array_internal.h
-
-  Validator.prototype.validateArray =
-      function (offset, elementSize, elementType, expectedDimensionSizes,
-                currentDimension) {
-    if (!internal.isAligned(offset))
-      return validationError.MISALIGNED_OBJECT;
-
-    if (!this.isValidRange(offset, internal.kArrayHeaderSize))
-      return validationError.ILLEGAL_MEMORY_RANGE;
-
-    var numBytes = this.message.buffer.getUint32(offset);
-    var numElements = this.message.buffer.getUint32(offset + 4);
-
-    // Note: this computation is "safe" because elementSize <= 8 and
-    // numElements is a uint32.
-    var elementsTotalSize = (elementType === internal.PackedBool) ?
-        Math.ceil(numElements / 8) : (elementSize * numElements);
-
-    if (numBytes < internal.kArrayHeaderSize + elementsTotalSize)
-      return validationError.UNEXPECTED_ARRAY_HEADER;
-
-    if (expectedDimensionSizes[currentDimension] != 0 &&
-        numElements != expectedDimensionSizes[currentDimension]) {
-      return validationError.UNEXPECTED_ARRAY_HEADER;
-    }
-
-    if (!this.claimRange(offset, numBytes))
-      return validationError.ILLEGAL_MEMORY_RANGE;
-
-    // Validate the array's elements if they are pointers or handles.
-
-    var elementsOffset = offset + internal.kArrayHeaderSize;
-    var nullable = isNullable(elementType);
-
-    if (isHandleClass(elementType))
-      return this.validateHandleElements(elementsOffset, numElements, nullable);
-    if (isInterfaceClass(elementType))
-      return this.validateInterfaceElements(
-          elementsOffset, numElements, nullable);
-    if (isInterfaceRequestClass(elementType))
-      return this.validateInterfaceRequestElements(
-          elementsOffset, numElements, nullable);
-    if (isAssociatedInterfaceClass(elementType))
-      return this.validateAssociatedInterfaceElements(
-          elementsOffset, numElements, nullable);
-    if (isAssociatedInterfaceRequestClass(elementType))
-      return this.validateAssociatedInterfaceRequestElements(
-          elementsOffset, numElements, nullable);
-    if (isStringClass(elementType))
-      return this.validateArrayElements(
-          elementsOffset, numElements, internal.Uint8, nullable, [0], 0);
-    if (elementType instanceof internal.PointerTo)
-      return this.validateStructElements(
-          elementsOffset, numElements, elementType.cls, nullable);
-    if (elementType instanceof internal.ArrayOf)
-      return this.validateArrayElements(
-          elementsOffset, numElements, elementType.cls, nullable,
-          expectedDimensionSizes, currentDimension + 1);
-    if (isEnumClass(elementType))
-      return this.validateEnumElements(elementsOffset, numElements,
-                                       elementType.cls);
-
-    return validationError.NONE;
-  };
-
-  // Note: the |offset + i * elementSize| computation in the validateFooElements
-  // methods below is "safe" because elementSize <= 8, offset and
-  // numElements are uint32, and 0 <= i < numElements.
-
-  Validator.prototype.validateHandleElements =
-      function(offset, numElements, nullable) {
-    var elementSize = internal.Handle.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateHandle(elementOffset, nullable);
-      if (err != validationError.NONE)
-        return err;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateInterfaceElements =
-      function(offset, numElements, nullable) {
-    var elementSize = internal.Interface.prototype.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateInterface(elementOffset, nullable);
-      if (err != validationError.NONE)
-        return err;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateInterfaceRequestElements =
-      function(offset, numElements, nullable) {
-    var elementSize = internal.InterfaceRequest.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateInterfaceRequest(elementOffset, nullable);
-      if (err != validationError.NONE)
-        return err;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateAssociatedInterfaceElements =
-      function(offset, numElements, nullable) {
-    var elementSize = internal.AssociatedInterfacePtrInfo.prototype.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateAssociatedInterface(elementOffset, nullable);
-      if (err != validationError.NONE) {
-        return err;
-      }
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateAssociatedInterfaceRequestElements =
-      function(offset, numElements, nullable) {
-    var elementSize = internal.AssociatedInterfaceRequest.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateAssociatedInterfaceRequest(elementOffset,
-          nullable);
-      if (err != validationError.NONE) {
-        return err;
-      }
-    }
-    return validationError.NONE;
-  };
-
-  // The elementClass parameter is the element type of the element arrays.
-  Validator.prototype.validateArrayElements =
-      function(offset, numElements, elementClass, nullable,
-               expectedDimensionSizes, currentDimension) {
-    var elementSize = internal.PointerTo.prototype.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateArrayPointer(
-          elementOffset, elementClass.encodedSize, elementClass, nullable,
-          expectedDimensionSizes, currentDimension);
-      if (err != validationError.NONE)
-        return err;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateStructElements =
-      function(offset, numElements, structClass, nullable) {
-    var elementSize = internal.PointerTo.prototype.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err =
-          this.validateStructPointer(elementOffset, structClass, nullable);
-      if (err != validationError.NONE)
-        return err;
-    }
-    return validationError.NONE;
-  };
-
-  Validator.prototype.validateEnumElements =
-      function(offset, numElements, enumClass) {
-    var elementSize = internal.Enum.prototype.encodedSize;
-    for (var i = 0; i < numElements; i++) {
-      var elementOffset = offset + i * elementSize;
-      var err = this.validateEnum(elementOffset, enumClass);
-      if (err != validationError.NONE)
-        return err;
-    }
-    return validationError.NONE;
-  };
-
-  internal.validationError = validationError;
-  internal.Validator = Validator;
-  internal.ValidationErrorObserverForTesting =
-      ValidationErrorObserverForTesting;
-  internal.reportValidationError = reportValidationError;
-  internal.isTestingMode = isTestingMode;
-  internal.clearTestingMode = clearTestingMode;
-})();
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'mojo/public/interfaces/bindings/interface_control_messages.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('mojo.interfaceControl');
-
-
-  var kRunMessageId = 0xFFFFFFFF;
-  var kRunOrClosePipeMessageId = 0xFFFFFFFE;
-
-  function RunMessageParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  RunMessageParams.prototype.initDefaults_ = function() {
-    this.input = null;
-  };
-  RunMessageParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  RunMessageParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate RunMessageParams.input
-    err = messageValidator.validateUnion(offset + codec.kStructHeaderSize + 0, RunInput, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  RunMessageParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  RunMessageParams.decode = function(decoder) {
-    var packed;
-    var val = new RunMessageParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.input = decoder.decodeStruct(RunInput);
-    return val;
-  };
-
-  RunMessageParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(RunMessageParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(RunInput, val.input);
-  };
-  function RunResponseMessageParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  RunResponseMessageParams.prototype.initDefaults_ = function() {
-    this.output = null;
-  };
-  RunResponseMessageParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  RunResponseMessageParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate RunResponseMessageParams.output
-    err = messageValidator.validateUnion(offset + codec.kStructHeaderSize + 0, RunOutput, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  RunResponseMessageParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  RunResponseMessageParams.decode = function(decoder) {
-    var packed;
-    var val = new RunResponseMessageParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.output = decoder.decodeStruct(RunOutput);
-    return val;
-  };
-
-  RunResponseMessageParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(RunResponseMessageParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(RunOutput, val.output);
-  };
-  function QueryVersion(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  QueryVersion.prototype.initDefaults_ = function() {
-  };
-  QueryVersion.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  QueryVersion.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  QueryVersion.encodedSize = codec.kStructHeaderSize + 0;
-
-  QueryVersion.decode = function(decoder) {
-    var packed;
-    var val = new QueryVersion();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  QueryVersion.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(QueryVersion.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function QueryVersionResult(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  QueryVersionResult.prototype.initDefaults_ = function() {
-    this.version = 0;
-  };
-  QueryVersionResult.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  QueryVersionResult.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  QueryVersionResult.encodedSize = codec.kStructHeaderSize + 8;
-
-  QueryVersionResult.decode = function(decoder) {
-    var packed;
-    var val = new QueryVersionResult();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.version = decoder.decodeStruct(codec.Uint32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  QueryVersionResult.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(QueryVersionResult.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint32, val.version);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function FlushForTesting(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  FlushForTesting.prototype.initDefaults_ = function() {
-  };
-  FlushForTesting.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  FlushForTesting.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  FlushForTesting.encodedSize = codec.kStructHeaderSize + 0;
-
-  FlushForTesting.decode = function(decoder) {
-    var packed;
-    var val = new FlushForTesting();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  FlushForTesting.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(FlushForTesting.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function RunOrClosePipeMessageParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  RunOrClosePipeMessageParams.prototype.initDefaults_ = function() {
-    this.input = null;
-  };
-  RunOrClosePipeMessageParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  RunOrClosePipeMessageParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate RunOrClosePipeMessageParams.input
-    err = messageValidator.validateUnion(offset + codec.kStructHeaderSize + 0, RunOrClosePipeInput, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  RunOrClosePipeMessageParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  RunOrClosePipeMessageParams.decode = function(decoder) {
-    var packed;
-    var val = new RunOrClosePipeMessageParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.input = decoder.decodeStruct(RunOrClosePipeInput);
-    return val;
-  };
-
-  RunOrClosePipeMessageParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(RunOrClosePipeMessageParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(RunOrClosePipeInput, val.input);
-  };
-  function RequireVersion(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  RequireVersion.prototype.initDefaults_ = function() {
-    this.version = 0;
-  };
-  RequireVersion.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  RequireVersion.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  RequireVersion.encodedSize = codec.kStructHeaderSize + 8;
-
-  RequireVersion.decode = function(decoder) {
-    var packed;
-    var val = new RequireVersion();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.version = decoder.decodeStruct(codec.Uint32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  RequireVersion.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(RequireVersion.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint32, val.version);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-
-  function RunInput(value) {
-    this.initDefault_();
-    this.initValue_(value);
-  }
-
-
-  RunInput.Tags = {
-    queryVersion: 0,
-    flushForTesting: 1,
-  };
-
-  RunInput.prototype.initDefault_ = function() {
-    this.$data = null;
-    this.$tag = undefined;
-  }
-
-  RunInput.prototype.initValue_ = function(value) {
-    if (value == undefined) {
-      return;
-    }
-
-    var keys = Object.keys(value);
-    if (keys.length == 0) {
-      return;
-    }
-
-    if (keys.length > 1) {
-      throw new TypeError("You may set only one member on a union.");
-    }
-
-    var fields = [
-        "queryVersion",
-        "flushForTesting",
-    ];
-
-    if (fields.indexOf(keys[0]) < 0) {
-      throw new ReferenceError(keys[0] + " is not a RunInput member.");
-
-    }
-
-    this[keys[0]] = value[keys[0]];
-  }
-  Object.defineProperty(RunInput.prototype, "queryVersion", {
-    get: function() {
-      if (this.$tag != RunInput.Tags.queryVersion) {
-        throw new ReferenceError(
-            "RunInput.queryVersion is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = RunInput.Tags.queryVersion;
-      this.$data = value;
-    }
-  });
-  Object.defineProperty(RunInput.prototype, "flushForTesting", {
-    get: function() {
-      if (this.$tag != RunInput.Tags.flushForTesting) {
-        throw new ReferenceError(
-            "RunInput.flushForTesting is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = RunInput.Tags.flushForTesting;
-      this.$data = value;
-    }
-  });
-
-
-    RunInput.encode = function(encoder, val) {
-      if (val == null) {
-        encoder.writeUint64(0);
-        encoder.writeUint64(0);
-        return;
-      }
-      if (val.$tag == undefined) {
-        throw new TypeError("Cannot encode unions with an unknown member set.");
-      }
-
-      encoder.writeUint32(16);
-      encoder.writeUint32(val.$tag);
-      switch (val.$tag) {
-        case RunInput.Tags.queryVersion:
-          encoder.encodeStructPointer(QueryVersion, val.queryVersion);
-          break;
-        case RunInput.Tags.flushForTesting:
-          encoder.encodeStructPointer(FlushForTesting, val.flushForTesting);
-          break;
-      }
-      encoder.align();
-    };
-
-
-    RunInput.decode = function(decoder) {
-      var size = decoder.readUint32();
-      if (size == 0) {
-        decoder.readUint32();
-        decoder.readUint64();
-        return null;
-      }
-
-      var result = new RunInput();
-      var tag = decoder.readUint32();
-      switch (tag) {
-        case RunInput.Tags.queryVersion:
-          result.queryVersion = decoder.decodeStructPointer(QueryVersion);
-          break;
-        case RunInput.Tags.flushForTesting:
-          result.flushForTesting = decoder.decodeStructPointer(FlushForTesting);
-          break;
-      }
-      decoder.align();
-
-      return result;
-    };
-
-
-    RunInput.validate = function(messageValidator, offset) {
-      var size = messageValidator.decodeUnionSize(offset);
-      if (size != 16) {
-        return validator.validationError.INVALID_UNION_SIZE;
-      }
-
-      var tag = messageValidator.decodeUnionTag(offset);
-      var data_offset = offset + 8;
-      var err;
-      switch (tag) {
-        case RunInput.Tags.queryVersion:
-          
-
-    // validate RunInput.queryVersion
-    err = messageValidator.validateStructPointer(data_offset, QueryVersion, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-        case RunInput.Tags.flushForTesting:
-          
-
-    // validate RunInput.flushForTesting
-    err = messageValidator.validateStructPointer(data_offset, FlushForTesting, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-      }
-
-      return validator.validationError.NONE;
-    };
-
-  RunInput.encodedSize = 16;
-
-  function RunOutput(value) {
-    this.initDefault_();
-    this.initValue_(value);
-  }
-
-
-  RunOutput.Tags = {
-    queryVersionResult: 0,
-  };
-
-  RunOutput.prototype.initDefault_ = function() {
-    this.$data = null;
-    this.$tag = undefined;
-  }
-
-  RunOutput.prototype.initValue_ = function(value) {
-    if (value == undefined) {
-      return;
-    }
-
-    var keys = Object.keys(value);
-    if (keys.length == 0) {
-      return;
-    }
-
-    if (keys.length > 1) {
-      throw new TypeError("You may set only one member on a union.");
-    }
-
-    var fields = [
-        "queryVersionResult",
-    ];
-
-    if (fields.indexOf(keys[0]) < 0) {
-      throw new ReferenceError(keys[0] + " is not a RunOutput member.");
-
-    }
-
-    this[keys[0]] = value[keys[0]];
-  }
-  Object.defineProperty(RunOutput.prototype, "queryVersionResult", {
-    get: function() {
-      if (this.$tag != RunOutput.Tags.queryVersionResult) {
-        throw new ReferenceError(
-            "RunOutput.queryVersionResult is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = RunOutput.Tags.queryVersionResult;
-      this.$data = value;
-    }
-  });
-
-
-    RunOutput.encode = function(encoder, val) {
-      if (val == null) {
-        encoder.writeUint64(0);
-        encoder.writeUint64(0);
-        return;
-      }
-      if (val.$tag == undefined) {
-        throw new TypeError("Cannot encode unions with an unknown member set.");
-      }
-
-      encoder.writeUint32(16);
-      encoder.writeUint32(val.$tag);
-      switch (val.$tag) {
-        case RunOutput.Tags.queryVersionResult:
-          encoder.encodeStructPointer(QueryVersionResult, val.queryVersionResult);
-          break;
-      }
-      encoder.align();
-    };
-
-
-    RunOutput.decode = function(decoder) {
-      var size = decoder.readUint32();
-      if (size == 0) {
-        decoder.readUint32();
-        decoder.readUint64();
-        return null;
-      }
-
-      var result = new RunOutput();
-      var tag = decoder.readUint32();
-      switch (tag) {
-        case RunOutput.Tags.queryVersionResult:
-          result.queryVersionResult = decoder.decodeStructPointer(QueryVersionResult);
-          break;
-      }
-      decoder.align();
-
-      return result;
-    };
-
-
-    RunOutput.validate = function(messageValidator, offset) {
-      var size = messageValidator.decodeUnionSize(offset);
-      if (size != 16) {
-        return validator.validationError.INVALID_UNION_SIZE;
-      }
-
-      var tag = messageValidator.decodeUnionTag(offset);
-      var data_offset = offset + 8;
-      var err;
-      switch (tag) {
-        case RunOutput.Tags.queryVersionResult:
-          
-
-    // validate RunOutput.queryVersionResult
-    err = messageValidator.validateStructPointer(data_offset, QueryVersionResult, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-      }
-
-      return validator.validationError.NONE;
-    };
-
-  RunOutput.encodedSize = 16;
-
-  function RunOrClosePipeInput(value) {
-    this.initDefault_();
-    this.initValue_(value);
-  }
-
-
-  RunOrClosePipeInput.Tags = {
-    requireVersion: 0,
-  };
-
-  RunOrClosePipeInput.prototype.initDefault_ = function() {
-    this.$data = null;
-    this.$tag = undefined;
-  }
-
-  RunOrClosePipeInput.prototype.initValue_ = function(value) {
-    if (value == undefined) {
-      return;
-    }
-
-    var keys = Object.keys(value);
-    if (keys.length == 0) {
-      return;
-    }
-
-    if (keys.length > 1) {
-      throw new TypeError("You may set only one member on a union.");
-    }
-
-    var fields = [
-        "requireVersion",
-    ];
-
-    if (fields.indexOf(keys[0]) < 0) {
-      throw new ReferenceError(keys[0] + " is not a RunOrClosePipeInput member.");
-
-    }
-
-    this[keys[0]] = value[keys[0]];
-  }
-  Object.defineProperty(RunOrClosePipeInput.prototype, "requireVersion", {
-    get: function() {
-      if (this.$tag != RunOrClosePipeInput.Tags.requireVersion) {
-        throw new ReferenceError(
-            "RunOrClosePipeInput.requireVersion is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = RunOrClosePipeInput.Tags.requireVersion;
-      this.$data = value;
-    }
-  });
-
-
-    RunOrClosePipeInput.encode = function(encoder, val) {
-      if (val == null) {
-        encoder.writeUint64(0);
-        encoder.writeUint64(0);
-        return;
-      }
-      if (val.$tag == undefined) {
-        throw new TypeError("Cannot encode unions with an unknown member set.");
-      }
-
-      encoder.writeUint32(16);
-      encoder.writeUint32(val.$tag);
-      switch (val.$tag) {
-        case RunOrClosePipeInput.Tags.requireVersion:
-          encoder.encodeStructPointer(RequireVersion, val.requireVersion);
-          break;
-      }
-      encoder.align();
-    };
-
-
-    RunOrClosePipeInput.decode = function(decoder) {
-      var size = decoder.readUint32();
-      if (size == 0) {
-        decoder.readUint32();
-        decoder.readUint64();
-        return null;
-      }
-
-      var result = new RunOrClosePipeInput();
-      var tag = decoder.readUint32();
-      switch (tag) {
-        case RunOrClosePipeInput.Tags.requireVersion:
-          result.requireVersion = decoder.decodeStructPointer(RequireVersion);
-          break;
-      }
-      decoder.align();
-
-      return result;
-    };
-
-
-    RunOrClosePipeInput.validate = function(messageValidator, offset) {
-      var size = messageValidator.decodeUnionSize(offset);
-      if (size != 16) {
-        return validator.validationError.INVALID_UNION_SIZE;
-      }
-
-      var tag = messageValidator.decodeUnionTag(offset);
-      var data_offset = offset + 8;
-      var err;
-      switch (tag) {
-        case RunOrClosePipeInput.Tags.requireVersion:
-          
-
-    // validate RunOrClosePipeInput.requireVersion
-    err = messageValidator.validateStructPointer(data_offset, RequireVersion, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-      }
-
-      return validator.validationError.NONE;
-    };
-
-  RunOrClosePipeInput.encodedSize = 16;
-  exports.kRunMessageId = kRunMessageId;
-  exports.kRunOrClosePipeMessageId = kRunOrClosePipeMessageId;
-  exports.RunMessageParams = RunMessageParams;
-  exports.RunResponseMessageParams = RunResponseMessageParams;
-  exports.QueryVersion = QueryVersion;
-  exports.QueryVersionResult = QueryVersionResult;
-  exports.FlushForTesting = FlushForTesting;
-  exports.RunOrClosePipeMessageParams = RunOrClosePipeMessageParams;
-  exports.RequireVersion = RequireVersion;
-  exports.RunInput = RunInput;
-  exports.RunOutput = RunOutput;
-  exports.RunOrClosePipeInput = RunOrClosePipeInput;
-})();// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'mojo/public/interfaces/bindings/pipe_control_messages.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('mojo.pipeControl');
-
-
-  var kRunOrClosePipeMessageId = 0xFFFFFFFE;
-
-  function RunOrClosePipeMessageParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  RunOrClosePipeMessageParams.prototype.initDefaults_ = function() {
-    this.input = null;
-  };
-  RunOrClosePipeMessageParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  RunOrClosePipeMessageParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate RunOrClosePipeMessageParams.input
-    err = messageValidator.validateUnion(offset + codec.kStructHeaderSize + 0, RunOrClosePipeInput, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  RunOrClosePipeMessageParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  RunOrClosePipeMessageParams.decode = function(decoder) {
-    var packed;
-    var val = new RunOrClosePipeMessageParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.input = decoder.decodeStruct(RunOrClosePipeInput);
-    return val;
-  };
-
-  RunOrClosePipeMessageParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(RunOrClosePipeMessageParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(RunOrClosePipeInput, val.input);
-  };
-  function DisconnectReason(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  DisconnectReason.prototype.initDefaults_ = function() {
-    this.customReason = 0;
-    this.description = null;
-  };
-  DisconnectReason.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  DisconnectReason.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate DisconnectReason.description
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 8, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  DisconnectReason.encodedSize = codec.kStructHeaderSize + 16;
-
-  DisconnectReason.decode = function(decoder) {
-    var packed;
-    var val = new DisconnectReason();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.customReason = decoder.decodeStruct(codec.Uint32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.description = decoder.decodeStruct(codec.String);
-    return val;
-  };
-
-  DisconnectReason.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(DisconnectReason.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint32, val.customReason);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStruct(codec.String, val.description);
-  };
-  function PeerAssociatedEndpointClosedEvent(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  PeerAssociatedEndpointClosedEvent.prototype.initDefaults_ = function() {
-    this.id = 0;
-    this.disconnectReason = null;
-  };
-  PeerAssociatedEndpointClosedEvent.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  PeerAssociatedEndpointClosedEvent.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate PeerAssociatedEndpointClosedEvent.disconnectReason
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, DisconnectReason, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  PeerAssociatedEndpointClosedEvent.encodedSize = codec.kStructHeaderSize + 16;
-
-  PeerAssociatedEndpointClosedEvent.decode = function(decoder) {
-    var packed;
-    var val = new PeerAssociatedEndpointClosedEvent();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.id = decoder.decodeStruct(codec.Uint32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.disconnectReason = decoder.decodeStructPointer(DisconnectReason);
-    return val;
-  };
-
-  PeerAssociatedEndpointClosedEvent.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(PeerAssociatedEndpointClosedEvent.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Uint32, val.id);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(DisconnectReason, val.disconnectReason);
-  };
-
-  function RunOrClosePipeInput(value) {
-    this.initDefault_();
-    this.initValue_(value);
-  }
-
-
-  RunOrClosePipeInput.Tags = {
-    peerAssociatedEndpointClosedEvent: 0,
-  };
-
-  RunOrClosePipeInput.prototype.initDefault_ = function() {
-    this.$data = null;
-    this.$tag = undefined;
-  }
-
-  RunOrClosePipeInput.prototype.initValue_ = function(value) {
-    if (value == undefined) {
-      return;
-    }
-
-    var keys = Object.keys(value);
-    if (keys.length == 0) {
-      return;
-    }
-
-    if (keys.length > 1) {
-      throw new TypeError("You may set only one member on a union.");
-    }
-
-    var fields = [
-        "peerAssociatedEndpointClosedEvent",
-    ];
-
-    if (fields.indexOf(keys[0]) < 0) {
-      throw new ReferenceError(keys[0] + " is not a RunOrClosePipeInput member.");
-
-    }
-
-    this[keys[0]] = value[keys[0]];
-  }
-  Object.defineProperty(RunOrClosePipeInput.prototype, "peerAssociatedEndpointClosedEvent", {
-    get: function() {
-      if (this.$tag != RunOrClosePipeInput.Tags.peerAssociatedEndpointClosedEvent) {
-        throw new ReferenceError(
-            "RunOrClosePipeInput.peerAssociatedEndpointClosedEvent is not currently set.");
-      }
-      return this.$data;
-    },
-
-    set: function(value) {
-      this.$tag = RunOrClosePipeInput.Tags.peerAssociatedEndpointClosedEvent;
-      this.$data = value;
-    }
-  });
-
-
-    RunOrClosePipeInput.encode = function(encoder, val) {
-      if (val == null) {
-        encoder.writeUint64(0);
-        encoder.writeUint64(0);
-        return;
-      }
-      if (val.$tag == undefined) {
-        throw new TypeError("Cannot encode unions with an unknown member set.");
-      }
-
-      encoder.writeUint32(16);
-      encoder.writeUint32(val.$tag);
-      switch (val.$tag) {
-        case RunOrClosePipeInput.Tags.peerAssociatedEndpointClosedEvent:
-          encoder.encodeStructPointer(PeerAssociatedEndpointClosedEvent, val.peerAssociatedEndpointClosedEvent);
-          break;
-      }
-      encoder.align();
-    };
-
-
-    RunOrClosePipeInput.decode = function(decoder) {
-      var size = decoder.readUint32();
-      if (size == 0) {
-        decoder.readUint32();
-        decoder.readUint64();
-        return null;
-      }
-
-      var result = new RunOrClosePipeInput();
-      var tag = decoder.readUint32();
-      switch (tag) {
-        case RunOrClosePipeInput.Tags.peerAssociatedEndpointClosedEvent:
-          result.peerAssociatedEndpointClosedEvent = decoder.decodeStructPointer(PeerAssociatedEndpointClosedEvent);
-          break;
-      }
-      decoder.align();
-
-      return result;
-    };
-
-
-    RunOrClosePipeInput.validate = function(messageValidator, offset) {
-      var size = messageValidator.decodeUnionSize(offset);
-      if (size != 16) {
-        return validator.validationError.INVALID_UNION_SIZE;
-      }
-
-      var tag = messageValidator.decodeUnionTag(offset);
-      var data_offset = offset + 8;
-      var err;
-      switch (tag) {
-        case RunOrClosePipeInput.Tags.peerAssociatedEndpointClosedEvent:
-          
-
-    // validate RunOrClosePipeInput.peerAssociatedEndpointClosedEvent
-    err = messageValidator.validateStructPointer(data_offset, PeerAssociatedEndpointClosedEvent, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-          break;
-      }
-
-      return validator.validationError.NONE;
-    };
-
-  RunOrClosePipeInput.encodedSize = 16;
-  exports.kRunOrClosePipeMessageId = kRunOrClosePipeMessageId;
-  exports.RunOrClosePipeMessageParams = RunOrClosePipeMessageParams;
-  exports.DisconnectReason = DisconnectReason;
-  exports.PeerAssociatedEndpointClosedEvent = PeerAssociatedEndpointClosedEvent;
-  exports.RunOrClosePipeInput = RunOrClosePipeInput;
-})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js.headers b/tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js.headers
deleted file mode 100644
index 6805c323df5..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/mojo_bindings.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js
deleted file mode 100644
index cfbad086898..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'content/test/data/mojo_web_test_helper_test.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-
-  // TODO(yzshen): Define these aliases to minimize the differences between the
-  // old/new modes. Remove them when the old mode goes away.
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('content.mojom');
-
-
-
-  function MojoWebTestHelper_Reverse_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  MojoWebTestHelper_Reverse_Params.prototype.initDefaults_ = function() {
-    this.message = null;
-  };
-  MojoWebTestHelper_Reverse_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  MojoWebTestHelper_Reverse_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate MojoWebTestHelper_Reverse_Params.message
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  MojoWebTestHelper_Reverse_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  MojoWebTestHelper_Reverse_Params.decode = function(decoder) {
-    var packed;
-    var val = new MojoWebTestHelper_Reverse_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.message = decoder.decodeStruct(codec.String);
-    return val;
-  };
-
-  MojoWebTestHelper_Reverse_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(MojoWebTestHelper_Reverse_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.message);
-  };
-  function MojoWebTestHelper_Reverse_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  MojoWebTestHelper_Reverse_ResponseParams.prototype.initDefaults_ = function() {
-    this.reversed = null;
-  };
-  MojoWebTestHelper_Reverse_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  MojoWebTestHelper_Reverse_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate MojoWebTestHelper_Reverse_ResponseParams.reversed
-    err = messageValidator.validateStringPointer(offset + codec.kStructHeaderSize + 0, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  MojoWebTestHelper_Reverse_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  MojoWebTestHelper_Reverse_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new MojoWebTestHelper_Reverse_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.reversed = decoder.decodeStruct(codec.String);
-    return val;
-  };
-
-  MojoWebTestHelper_Reverse_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(MojoWebTestHelper_Reverse_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.String, val.reversed);
-  };
-  var kMojoWebTestHelper_Reverse_Name = 0;
-
-  function MojoWebTestHelperPtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(MojoWebTestHelper,
-                                                   handleOrPtrInfo);
-  }
-
-  function MojoWebTestHelperAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        MojoWebTestHelper, associatedInterfacePtrInfo);
-  }
-
-  MojoWebTestHelperAssociatedPtr.prototype =
-      Object.create(MojoWebTestHelperPtr.prototype);
-  MojoWebTestHelperAssociatedPtr.prototype.constructor =
-      MojoWebTestHelperAssociatedPtr;
-
-  function MojoWebTestHelperProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  MojoWebTestHelperPtr.prototype.reverse = function() {
-    return MojoWebTestHelperProxy.prototype.reverse
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  MojoWebTestHelperProxy.prototype.reverse = function(message) {
-    var params = new MojoWebTestHelper_Reverse_Params();
-    params.message = message;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kMojoWebTestHelper_Reverse_Name,
-          codec.align(MojoWebTestHelper_Reverse_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(MojoWebTestHelper_Reverse_Params, params);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(MojoWebTestHelper_Reverse_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-
-  function MojoWebTestHelperStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  MojoWebTestHelperStub.prototype.reverse = function(message) {
-    return this.delegate_ && this.delegate_.reverse && this.delegate_.reverse(message);
-  }
-
-  MojoWebTestHelperStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  MojoWebTestHelperStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kMojoWebTestHelper_Reverse_Name:
-      var params = reader.decodeStruct(MojoWebTestHelper_Reverse_Params);
-      this.reverse(params.message).then(function(response) {
-        var responseParams =
-            new MojoWebTestHelper_Reverse_ResponseParams();
-        responseParams.reversed = response.reversed;
-        var builder = new codec.MessageV1Builder(
-            kMojoWebTestHelper_Reverse_Name,
-            codec.align(MojoWebTestHelper_Reverse_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(MojoWebTestHelper_Reverse_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  function validateMojoWebTestHelperRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kMojoWebTestHelper_Reverse_Name:
-        if (message.expectsResponse())
-          paramsClass = MojoWebTestHelper_Reverse_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateMojoWebTestHelperResponse(messageValidator) {
-   var message = messageValidator.message;
-   var paramsClass = null;
-   switch (message.getName()) {
-      case kMojoWebTestHelper_Reverse_Name:
-        if (message.isResponse())
-          paramsClass = MojoWebTestHelper_Reverse_ResponseParams;
-        break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  var MojoWebTestHelper = {
-    name: 'content.mojom.MojoWebTestHelper',
-    kVersion: 0,
-    ptrClass: MojoWebTestHelperPtr,
-    proxyClass: MojoWebTestHelperProxy,
-    stubClass: MojoWebTestHelperStub,
-    validateRequest: validateMojoWebTestHelperRequest,
-    validateResponse: validateMojoWebTestHelperResponse,
-  };
-  MojoWebTestHelperStub.prototype.validator = validateMojoWebTestHelperRequest;
-  MojoWebTestHelperProxy.prototype.validator = validateMojoWebTestHelperResponse;
-  exports.MojoWebTestHelper = MojoWebTestHelper;
-  exports.MojoWebTestHelperPtr = MojoWebTestHelperPtr;
-  exports.MojoWebTestHelperAssociatedPtr = MojoWebTestHelperAssociatedPtr;
-})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js.headers b/tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js.headers
deleted file mode 100644
index 6805c323df5..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/mojo_web_test_helper_test.mojom.js.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
index 1a7e15819e6..4c5f68be9d5 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
@@ -94,10 +94,10 @@ function compareNDEFRecords(providedRecord, receivedRecord) {
 // Compares NDEFWriteOptions structures that were provided to API and
 // received by the mock mojo service.
 function assertNDEFWriteOptionsEqual(provided, received) {
-  if (provided.ignoreRead !== undefined)
-    assert_equals(provided.ignoreRead, !!received.ignoreRead);
+  if (provided.overwrite !== undefined)
+    assert_equals(provided.overwrite, !!received.overwrite);
   else
-    assert_equals(!!received.ignore_read, true);
+    assert_equals(!!received.overwrite, true);
 }
 
 // Compares NDEFReaderOptions structures that were provided to API and
@@ -319,8 +319,9 @@ var WebNFCTest = (() => {
       this.reading_messages_.push(message);
       // Ignores reading if NFC operation is suspended.
       if(this.operations_suspended_) return;
-      // Ignores reading if NDEFWriteOptions.ignoreRead is true.
-      if (this.pending_write_options_ && this.pending_write_options_.ignoreRead)
+      // when overwrite is false, the write algorithm will read the NFC tag
+      // to determine if it has NDEF records on it.
+      if (this.pending_write_options_ && this.pending_write_options_.overwrite)
         return;
       // Triggers onWatch if the new message matches existing watchers.
       for (let watcher of this.watchers_) {
diff --git a/tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js
deleted file mode 100644
index 7578dd6d64f..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js
+++ /dev/null
@@ -1,1074 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'services/device/public/mojom/sensor.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('device.mojom');
-
-
-  var SensorType = {};
-  SensorType.AMBIENT_LIGHT = 0;
-  SensorType.PROXIMITY = SensorType.AMBIENT_LIGHT + 1;
-  SensorType.ACCELEROMETER = SensorType.PROXIMITY + 1;
-  SensorType.LINEAR_ACCELERATION = SensorType.ACCELEROMETER + 1;
-  SensorType.GYROSCOPE = SensorType.LINEAR_ACCELERATION + 1;
-  SensorType.MAGNETOMETER = SensorType.GYROSCOPE + 1;
-  SensorType.PRESSURE = SensorType.MAGNETOMETER + 1;
-  SensorType.ABSOLUTE_ORIENTATION_EULER_ANGLES = SensorType.PRESSURE + 1;
-  SensorType.ABSOLUTE_ORIENTATION_QUATERNION = SensorType.ABSOLUTE_ORIENTATION_EULER_ANGLES + 1;
-  SensorType.RELATIVE_ORIENTATION_EULER_ANGLES = SensorType.ABSOLUTE_ORIENTATION_QUATERNION + 1;
-  SensorType.RELATIVE_ORIENTATION_QUATERNION = SensorType.RELATIVE_ORIENTATION_EULER_ANGLES + 1;
-  SensorType.MIN_VALUE = 0,
-  SensorType.MAX_VALUE = 10,
-
-  SensorType.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-      return true;
-    }
-    return false;
-  };
-
-  SensorType.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-  var ReportingMode = {};
-  ReportingMode.ON_CHANGE = 0;
-  ReportingMode.CONTINUOUS = ReportingMode.ON_CHANGE + 1;
-  ReportingMode.MIN_VALUE = 0,
-  ReportingMode.MAX_VALUE = 1,
-
-  ReportingMode.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-      return true;
-    }
-    return false;
-  };
-
-  ReportingMode.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-
-  function SensorConfiguration(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  SensorConfiguration.prototype.initDefaults_ = function() {
-    this.frequency = 0;
-  };
-  SensorConfiguration.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  SensorConfiguration.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  SensorConfiguration.encodedSize = codec.kStructHeaderSize + 8;
-
-  SensorConfiguration.decode = function(decoder) {
-    var packed;
-    var val = new SensorConfiguration();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.frequency = decoder.decodeStruct(codec.Double);
-    return val;
-  };
-
-  SensorConfiguration.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(SensorConfiguration.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Double, val.frequency);
-  };
-  function Sensor_GetDefaultConfiguration_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_GetDefaultConfiguration_Params.prototype.initDefaults_ = function() {
-  };
-  Sensor_GetDefaultConfiguration_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_GetDefaultConfiguration_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_GetDefaultConfiguration_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  Sensor_GetDefaultConfiguration_Params.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_GetDefaultConfiguration_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  Sensor_GetDefaultConfiguration_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_GetDefaultConfiguration_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function Sensor_GetDefaultConfiguration_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_GetDefaultConfiguration_ResponseParams.prototype.initDefaults_ = function() {
-    this.configuration = null;
-  };
-  Sensor_GetDefaultConfiguration_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_GetDefaultConfiguration_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate Sensor_GetDefaultConfiguration_ResponseParams.configuration
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, SensorConfiguration, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_GetDefaultConfiguration_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  Sensor_GetDefaultConfiguration_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_GetDefaultConfiguration_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.configuration = decoder.decodeStructPointer(SensorConfiguration);
-    return val;
-  };
-
-  Sensor_GetDefaultConfiguration_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_GetDefaultConfiguration_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(SensorConfiguration, val.configuration);
-  };
-  function Sensor_AddConfiguration_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_AddConfiguration_Params.prototype.initDefaults_ = function() {
-    this.configuration = null;
-  };
-  Sensor_AddConfiguration_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_AddConfiguration_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate Sensor_AddConfiguration_Params.configuration
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, SensorConfiguration, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_AddConfiguration_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  Sensor_AddConfiguration_Params.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_AddConfiguration_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.configuration = decoder.decodeStructPointer(SensorConfiguration);
-    return val;
-  };
-
-  Sensor_AddConfiguration_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_AddConfiguration_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(SensorConfiguration, val.configuration);
-  };
-  function Sensor_AddConfiguration_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_AddConfiguration_ResponseParams.prototype.initDefaults_ = function() {
-    this.success = false;
-  };
-  Sensor_AddConfiguration_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_AddConfiguration_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_AddConfiguration_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
-
-  Sensor_AddConfiguration_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_AddConfiguration_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.success = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  Sensor_AddConfiguration_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_AddConfiguration_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.success & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function Sensor_RemoveConfiguration_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_RemoveConfiguration_Params.prototype.initDefaults_ = function() {
-    this.configuration = null;
-  };
-  Sensor_RemoveConfiguration_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_RemoveConfiguration_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate Sensor_RemoveConfiguration_Params.configuration
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, SensorConfiguration, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_RemoveConfiguration_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  Sensor_RemoveConfiguration_Params.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_RemoveConfiguration_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.configuration = decoder.decodeStructPointer(SensorConfiguration);
-    return val;
-  };
-
-  Sensor_RemoveConfiguration_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_RemoveConfiguration_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStructPointer(SensorConfiguration, val.configuration);
-  };
-  function Sensor_Suspend_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_Suspend_Params.prototype.initDefaults_ = function() {
-  };
-  Sensor_Suspend_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_Suspend_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_Suspend_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  Sensor_Suspend_Params.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_Suspend_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  Sensor_Suspend_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_Suspend_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function Sensor_Resume_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_Resume_Params.prototype.initDefaults_ = function() {
-  };
-  Sensor_Resume_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_Resume_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_Resume_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  Sensor_Resume_Params.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_Resume_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  Sensor_Resume_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_Resume_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function Sensor_ConfigureReadingChangeNotifications_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  Sensor_ConfigureReadingChangeNotifications_Params.prototype.initDefaults_ = function() {
-    this.enabled = false;
-  };
-  Sensor_ConfigureReadingChangeNotifications_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  Sensor_ConfigureReadingChangeNotifications_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    return validator.validationError.NONE;
-  };
-
-  Sensor_ConfigureReadingChangeNotifications_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  Sensor_ConfigureReadingChangeNotifications_Params.decode = function(decoder) {
-    var packed;
-    var val = new Sensor_ConfigureReadingChangeNotifications_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    packed = decoder.readUint8();
-    val.enabled = (packed >> 0) & 1 ? true : false;
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  Sensor_ConfigureReadingChangeNotifications_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(Sensor_ConfigureReadingChangeNotifications_Params.encodedSize);
-    encoder.writeUint32(0);
-    packed = 0;
-    packed |= (val.enabled & 1) << 0
-    encoder.writeUint8(packed);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function SensorClient_RaiseError_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  SensorClient_RaiseError_Params.prototype.initDefaults_ = function() {
-  };
-  SensorClient_RaiseError_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  SensorClient_RaiseError_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  SensorClient_RaiseError_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  SensorClient_RaiseError_Params.decode = function(decoder) {
-    var packed;
-    var val = new SensorClient_RaiseError_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  SensorClient_RaiseError_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(SensorClient_RaiseError_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  function SensorClient_SensorReadingChanged_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  SensorClient_SensorReadingChanged_Params.prototype.initDefaults_ = function() {
-  };
-  SensorClient_SensorReadingChanged_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  SensorClient_SensorReadingChanged_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 8}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  SensorClient_SensorReadingChanged_Params.encodedSize = codec.kStructHeaderSize + 0;
-
-  SensorClient_SensorReadingChanged_Params.decode = function(decoder) {
-    var packed;
-    var val = new SensorClient_SensorReadingChanged_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    return val;
-  };
-
-  SensorClient_SensorReadingChanged_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(SensorClient_SensorReadingChanged_Params.encodedSize);
-    encoder.writeUint32(0);
-  };
-  var kSensor_GetDefaultConfiguration_Name = 0;
-  var kSensor_AddConfiguration_Name = 1;
-  var kSensor_RemoveConfiguration_Name = 2;
-  var kSensor_Suspend_Name = 3;
-  var kSensor_Resume_Name = 4;
-  var kSensor_ConfigureReadingChangeNotifications_Name = 5;
-
-  function SensorPtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(Sensor,
-                                                   handleOrPtrInfo);
-  }
-
-  function SensorAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        Sensor, associatedInterfacePtrInfo);
-  }
-
-  SensorAssociatedPtr.prototype =
-      Object.create(SensorPtr.prototype);
-  SensorAssociatedPtr.prototype.constructor =
-      SensorAssociatedPtr;
-
-  function SensorProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  SensorPtr.prototype.getDefaultConfiguration = function() {
-    return SensorProxy.prototype.getDefaultConfiguration
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProxy.prototype.getDefaultConfiguration = function() {
-    var params_ = new Sensor_GetDefaultConfiguration_Params();
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kSensor_GetDefaultConfiguration_Name,
-          codec.align(Sensor_GetDefaultConfiguration_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(Sensor_GetDefaultConfiguration_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(Sensor_GetDefaultConfiguration_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  SensorPtr.prototype.addConfiguration = function() {
-    return SensorProxy.prototype.addConfiguration
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProxy.prototype.addConfiguration = function(configuration) {
-    var params_ = new Sensor_AddConfiguration_Params();
-    params_.configuration = configuration;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kSensor_AddConfiguration_Name,
-          codec.align(Sensor_AddConfiguration_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(Sensor_AddConfiguration_Params, params_);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(Sensor_AddConfiguration_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-  SensorPtr.prototype.removeConfiguration = function() {
-    return SensorProxy.prototype.removeConfiguration
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProxy.prototype.removeConfiguration = function(configuration) {
-    var params_ = new Sensor_RemoveConfiguration_Params();
-    params_.configuration = configuration;
-    var builder = new codec.MessageV0Builder(
-        kSensor_RemoveConfiguration_Name,
-        codec.align(Sensor_RemoveConfiguration_Params.encodedSize));
-    builder.encodeStruct(Sensor_RemoveConfiguration_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  SensorPtr.prototype.suspend = function() {
-    return SensorProxy.prototype.suspend
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProxy.prototype.suspend = function() {
-    var params_ = new Sensor_Suspend_Params();
-    var builder = new codec.MessageV0Builder(
-        kSensor_Suspend_Name,
-        codec.align(Sensor_Suspend_Params.encodedSize));
-    builder.encodeStruct(Sensor_Suspend_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  SensorPtr.prototype.resume = function() {
-    return SensorProxy.prototype.resume
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProxy.prototype.resume = function() {
-    var params_ = new Sensor_Resume_Params();
-    var builder = new codec.MessageV0Builder(
-        kSensor_Resume_Name,
-        codec.align(Sensor_Resume_Params.encodedSize));
-    builder.encodeStruct(Sensor_Resume_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  SensorPtr.prototype.configureReadingChangeNotifications = function() {
-    return SensorProxy.prototype.configureReadingChangeNotifications
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProxy.prototype.configureReadingChangeNotifications = function(enabled) {
-    var params_ = new Sensor_ConfigureReadingChangeNotifications_Params();
-    params_.enabled = enabled;
-    var builder = new codec.MessageV0Builder(
-        kSensor_ConfigureReadingChangeNotifications_Name,
-        codec.align(Sensor_ConfigureReadingChangeNotifications_Params.encodedSize));
-    builder.encodeStruct(Sensor_ConfigureReadingChangeNotifications_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-
-  function SensorStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  SensorStub.prototype.getDefaultConfiguration = function() {
-    return this.delegate_ && this.delegate_.getDefaultConfiguration && this.delegate_.getDefaultConfiguration();
-  }
-  SensorStub.prototype.addConfiguration = function(configuration) {
-    return this.delegate_ && this.delegate_.addConfiguration && this.delegate_.addConfiguration(configuration);
-  }
-  SensorStub.prototype.removeConfiguration = function(configuration) {
-    return this.delegate_ && this.delegate_.removeConfiguration && this.delegate_.removeConfiguration(configuration);
-  }
-  SensorStub.prototype.suspend = function() {
-    return this.delegate_ && this.delegate_.suspend && this.delegate_.suspend();
-  }
-  SensorStub.prototype.resume = function() {
-    return this.delegate_ && this.delegate_.resume && this.delegate_.resume();
-  }
-  SensorStub.prototype.configureReadingChangeNotifications = function(enabled) {
-    return this.delegate_ && this.delegate_.configureReadingChangeNotifications && this.delegate_.configureReadingChangeNotifications(enabled);
-  }
-
-  SensorStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kSensor_RemoveConfiguration_Name:
-      var params = reader.decodeStruct(Sensor_RemoveConfiguration_Params);
-      this.removeConfiguration(params.configuration);
-      return true;
-    case kSensor_Suspend_Name:
-      var params = reader.decodeStruct(Sensor_Suspend_Params);
-      this.suspend();
-      return true;
-    case kSensor_Resume_Name:
-      var params = reader.decodeStruct(Sensor_Resume_Params);
-      this.resume();
-      return true;
-    case kSensor_ConfigureReadingChangeNotifications_Name:
-      var params = reader.decodeStruct(Sensor_ConfigureReadingChangeNotifications_Params);
-      this.configureReadingChangeNotifications(params.enabled);
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  SensorStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kSensor_GetDefaultConfiguration_Name:
-      var params = reader.decodeStruct(Sensor_GetDefaultConfiguration_Params);
-      this.getDefaultConfiguration().then(function(response) {
-        var responseParams =
-            new Sensor_GetDefaultConfiguration_ResponseParams();
-        responseParams.configuration = response.configuration;
-        var builder = new codec.MessageV1Builder(
-            kSensor_GetDefaultConfiguration_Name,
-            codec.align(Sensor_GetDefaultConfiguration_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(Sensor_GetDefaultConfiguration_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    case kSensor_AddConfiguration_Name:
-      var params = reader.decodeStruct(Sensor_AddConfiguration_Params);
-      this.addConfiguration(params.configuration).then(function(response) {
-        var responseParams =
-            new Sensor_AddConfiguration_ResponseParams();
-        responseParams.success = response.success;
-        var builder = new codec.MessageV1Builder(
-            kSensor_AddConfiguration_Name,
-            codec.align(Sensor_AddConfiguration_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(Sensor_AddConfiguration_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  function validateSensorRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kSensor_GetDefaultConfiguration_Name:
-        if (message.expectsResponse())
-          paramsClass = Sensor_GetDefaultConfiguration_Params;
-      break;
-      case kSensor_AddConfiguration_Name:
-        if (message.expectsResponse())
-          paramsClass = Sensor_AddConfiguration_Params;
-      break;
-      case kSensor_RemoveConfiguration_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = Sensor_RemoveConfiguration_Params;
-      break;
-      case kSensor_Suspend_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = Sensor_Suspend_Params;
-      break;
-      case kSensor_Resume_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = Sensor_Resume_Params;
-      break;
-      case kSensor_ConfigureReadingChangeNotifications_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = Sensor_ConfigureReadingChangeNotifications_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateSensorResponse(messageValidator) {
-   var message = messageValidator.message;
-   var paramsClass = null;
-   switch (message.getName()) {
-      case kSensor_GetDefaultConfiguration_Name:
-        if (message.isResponse())
-          paramsClass = Sensor_GetDefaultConfiguration_ResponseParams;
-        break;
-      case kSensor_AddConfiguration_Name:
-        if (message.isResponse())
-          paramsClass = Sensor_AddConfiguration_ResponseParams;
-        break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  var Sensor = {
-    name: 'device.mojom.Sensor',
-    kVersion: 0,
-    ptrClass: SensorPtr,
-    proxyClass: SensorProxy,
-    stubClass: SensorStub,
-    validateRequest: validateSensorRequest,
-    validateResponse: validateSensorResponse,
-  };
-  SensorStub.prototype.validator = validateSensorRequest;
-  SensorProxy.prototype.validator = validateSensorResponse;
-  var kSensorClient_RaiseError_Name = 0;
-  var kSensorClient_SensorReadingChanged_Name = 1;
-
-  function SensorClientPtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(SensorClient,
-                                                   handleOrPtrInfo);
-  }
-
-  function SensorClientAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        SensorClient, associatedInterfacePtrInfo);
-  }
-
-  SensorClientAssociatedPtr.prototype =
-      Object.create(SensorClientPtr.prototype);
-  SensorClientAssociatedPtr.prototype.constructor =
-      SensorClientAssociatedPtr;
-
-  function SensorClientProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  SensorClientPtr.prototype.raiseError = function() {
-    return SensorClientProxy.prototype.raiseError
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorClientProxy.prototype.raiseError = function() {
-    var params_ = new SensorClient_RaiseError_Params();
-    var builder = new codec.MessageV0Builder(
-        kSensorClient_RaiseError_Name,
-        codec.align(SensorClient_RaiseError_Params.encodedSize));
-    builder.encodeStruct(SensorClient_RaiseError_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-  SensorClientPtr.prototype.sensorReadingChanged = function() {
-    return SensorClientProxy.prototype.sensorReadingChanged
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorClientProxy.prototype.sensorReadingChanged = function() {
-    var params_ = new SensorClient_SensorReadingChanged_Params();
-    var builder = new codec.MessageV0Builder(
-        kSensorClient_SensorReadingChanged_Name,
-        codec.align(SensorClient_SensorReadingChanged_Params.encodedSize));
-    builder.encodeStruct(SensorClient_SensorReadingChanged_Params, params_);
-    var message = builder.finish();
-    this.receiver_.accept(message);
-  };
-
-  function SensorClientStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  SensorClientStub.prototype.raiseError = function() {
-    return this.delegate_ && this.delegate_.raiseError && this.delegate_.raiseError();
-  }
-  SensorClientStub.prototype.sensorReadingChanged = function() {
-    return this.delegate_ && this.delegate_.sensorReadingChanged && this.delegate_.sensorReadingChanged();
-  }
-
-  SensorClientStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kSensorClient_RaiseError_Name:
-      var params = reader.decodeStruct(SensorClient_RaiseError_Params);
-      this.raiseError();
-      return true;
-    case kSensorClient_SensorReadingChanged_Name:
-      var params = reader.decodeStruct(SensorClient_SensorReadingChanged_Params);
-      this.sensorReadingChanged();
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  SensorClientStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  function validateSensorClientRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kSensorClient_RaiseError_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = SensorClient_RaiseError_Params;
-      break;
-      case kSensorClient_SensorReadingChanged_Name:
-        if (!message.expectsResponse() && !message.isResponse())
-          paramsClass = SensorClient_SensorReadingChanged_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateSensorClientResponse(messageValidator) {
-    return validator.validationError.NONE;
-  }
-
-  var SensorClient = {
-    name: 'device.mojom.SensorClient',
-    kVersion: 0,
-    ptrClass: SensorClientPtr,
-    proxyClass: SensorClientProxy,
-    stubClass: SensorClientStub,
-    validateRequest: validateSensorClientRequest,
-    validateResponse: null,
-  };
-  SensorClientStub.prototype.validator = validateSensorClientRequest;
-  SensorClientProxy.prototype.validator = null;
-  exports.SensorType = SensorType;
-  exports.ReportingMode = ReportingMode;
-  exports.SensorConfiguration = SensorConfiguration;
-  exports.Sensor = Sensor;
-  exports.SensorPtr = SensorPtr;
-  exports.SensorAssociatedPtr = SensorAssociatedPtr;
-  exports.SensorClient = SensorClient;
-  exports.SensorClientPtr = SensorClientPtr;
-  exports.SensorClientAssociatedPtr = SensorClientAssociatedPtr;
-})();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js
deleted file mode 100644
index d82b15a304a..00000000000
--- a/tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-'use strict';
-
-(function() {
-  var mojomId = 'services/device/public/mojom/sensor_provider.mojom';
-  if (mojo.internal.isMojomLoaded(mojomId)) {
-    console.warn('The following mojom is loaded multiple times: ' + mojomId);
-    return;
-  }
-  mojo.internal.markMojomLoaded(mojomId);
-  var bindings = mojo;
-  var associatedBindings = mojo;
-  var codec = mojo.internal;
-  var validator = mojo.internal;
-
-  var exports = mojo.internal.exposeNamespace('device.mojom');
-  var sensor$ =
-      mojo.internal.exposeNamespace('device.mojom');
-  if (mojo.config.autoLoadMojomDeps) {
-    mojo.internal.loadMojomIfNecessary(
-        'services/device/public/mojom/sensor.mojom', 'sensor.mojom.js');
-  }
-
-
-  var SensorCreationResult = {};
-  SensorCreationResult.SUCCESS = 0;
-  SensorCreationResult.ERROR_NOT_AVAILABLE = SensorCreationResult.SUCCESS + 1;
-  SensorCreationResult.ERROR_NOT_ALLOWED = SensorCreationResult.ERROR_NOT_AVAILABLE + 1;
-
-  SensorCreationResult.isKnownEnumValue = function(value) {
-    switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    }
-    return false;
-  };
-
-  SensorCreationResult.validate = function(enumValue) {
-    var isExtensible = false;
-    if (isExtensible || this.isKnownEnumValue(enumValue))
-      return validator.validationError.NONE;
-
-    return validator.validationError.UNKNOWN_ENUM_VALUE;
-  };
-
-  function SensorInitParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  SensorInitParams.kReadBufferSizeForTests = 48;
-  SensorInitParams.prototype.initDefaults_ = function() {
-    this.sensor = new sensor$.SensorPtr();
-    this.clientReceiver = new bindings.InterfaceRequest();
-    this.memory = null;
-    this.bufferOffset = 0;
-    this.mode = 0;
-    this.defaultConfiguration = null;
-    this.maximumFrequency = 0;
-    this.minimumFrequency = 0;
-  };
-  SensorInitParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  SensorInitParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 64}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorInitParams.sensor
-    err = messageValidator.validateInterface(offset + codec.kStructHeaderSize + 0, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorInitParams.clientReceiver
-    err = messageValidator.validateInterfaceRequest(offset + codec.kStructHeaderSize + 8, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorInitParams.memory
-    err = messageValidator.validateHandle(offset + codec.kStructHeaderSize + 12, false)
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    // validate SensorInitParams.mode
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 24, sensor$.ReportingMode);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorInitParams.defaultConfiguration
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 32, sensor$.SensorConfiguration, false);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-
-    return validator.validationError.NONE;
-  };
-
-  SensorInitParams.encodedSize = codec.kStructHeaderSize + 56;
-
-  SensorInitParams.decode = function(decoder) {
-    var packed;
-    var val = new SensorInitParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.sensor = decoder.decodeStruct(new codec.Interface(sensor$.SensorPtr));
-    val.clientReceiver = decoder.decodeStruct(codec.InterfaceRequest);
-    val.memory = decoder.decodeStruct(codec.Handle);
-    val.bufferOffset = decoder.decodeStruct(codec.Uint64);
-    val.mode = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.defaultConfiguration = decoder.decodeStructPointer(sensor$.SensorConfiguration);
-    val.maximumFrequency = decoder.decodeStruct(codec.Double);
-    val.minimumFrequency = decoder.decodeStruct(codec.Double);
-    return val;
-  };
-
-  SensorInitParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(SensorInitParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(new codec.Interface(sensor$.SensorPtr), val.sensor);
-    encoder.encodeStruct(codec.InterfaceRequest, val.clientReceiver);
-    encoder.encodeStruct(codec.Handle, val.memory);
-    encoder.encodeStruct(codec.Uint64, val.bufferOffset);
-    encoder.encodeStruct(codec.Int32, val.mode);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(sensor$.SensorConfiguration, val.defaultConfiguration);
-    encoder.encodeStruct(codec.Double, val.maximumFrequency);
-    encoder.encodeStruct(codec.Double, val.minimumFrequency);
-  };
-  function SensorProvider_GetSensor_Params(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  SensorProvider_GetSensor_Params.prototype.initDefaults_ = function() {
-    this.type = 0;
-  };
-  SensorProvider_GetSensor_Params.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  SensorProvider_GetSensor_Params.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 16}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorProvider_GetSensor_Params.type
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, sensor$.SensorType);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  SensorProvider_GetSensor_Params.encodedSize = codec.kStructHeaderSize + 8;
-
-  SensorProvider_GetSensor_Params.decode = function(decoder) {
-    var packed;
-    var val = new SensorProvider_GetSensor_Params();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.type = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    return val;
-  };
-
-  SensorProvider_GetSensor_Params.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(SensorProvider_GetSensor_Params.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.type);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-  };
-  function SensorProvider_GetSensor_ResponseParams(values) {
-    this.initDefaults_();
-    this.initFields_(values);
-  }
-
-
-  SensorProvider_GetSensor_ResponseParams.prototype.initDefaults_ = function() {
-    this.result = 0;
-    this.initParams = null;
-  };
-  SensorProvider_GetSensor_ResponseParams.prototype.initFields_ = function(fields) {
-    for(var field in fields) {
-        if (this.hasOwnProperty(field))
-          this[field] = fields[field];
-    }
-  };
-
-  SensorProvider_GetSensor_ResponseParams.validate = function(messageValidator, offset) {
-    var err;
-    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    var kVersionSizes = [
-      {version: 0, numBytes: 24}
-    ];
-    err = messageValidator.validateStructVersion(offset, kVersionSizes);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorProvider_GetSensor_ResponseParams.result
-    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, SensorCreationResult);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-
-    // validate SensorProvider_GetSensor_ResponseParams.initParams
-    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, SensorInitParams, true);
-    if (err !== validator.validationError.NONE)
-        return err;
-
-    return validator.validationError.NONE;
-  };
-
-  SensorProvider_GetSensor_ResponseParams.encodedSize = codec.kStructHeaderSize + 16;
-
-  SensorProvider_GetSensor_ResponseParams.decode = function(decoder) {
-    var packed;
-    var val = new SensorProvider_GetSensor_ResponseParams();
-    var numberOfBytes = decoder.readUint32();
-    var version = decoder.readUint32();
-    val.result = decoder.decodeStruct(codec.Int32);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    decoder.skip(1);
-    val.initParams = decoder.decodeStructPointer(SensorInitParams);
-    return val;
-  };
-
-  SensorProvider_GetSensor_ResponseParams.encode = function(encoder, val) {
-    var packed;
-    encoder.writeUint32(SensorProvider_GetSensor_ResponseParams.encodedSize);
-    encoder.writeUint32(0);
-    encoder.encodeStruct(codec.Int32, val.result);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.skip(1);
-    encoder.encodeStructPointer(SensorInitParams, val.initParams);
-  };
-  var kSensorProvider_GetSensor_Name = 0;
-
-  function SensorProviderPtr(handleOrPtrInfo) {
-    this.ptr = new bindings.InterfacePtrController(SensorProvider,
-                                                   handleOrPtrInfo);
-  }
-
-  function SensorProviderAssociatedPtr(associatedInterfacePtrInfo) {
-    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
-        SensorProvider, associatedInterfacePtrInfo);
-  }
-
-  SensorProviderAssociatedPtr.prototype =
-      Object.create(SensorProviderPtr.prototype);
-  SensorProviderAssociatedPtr.prototype.constructor =
-      SensorProviderAssociatedPtr;
-
-  function SensorProviderProxy(receiver) {
-    this.receiver_ = receiver;
-  }
-  SensorProviderPtr.prototype.getSensor = function() {
-    return SensorProviderProxy.prototype.getSensor
-        .apply(this.ptr.getProxy(), arguments);
-  };
-
-  SensorProviderProxy.prototype.getSensor = function(type) {
-    var params = new SensorProvider_GetSensor_Params();
-    params.type = type;
-    return new Promise(function(resolve, reject) {
-      var builder = new codec.MessageV1Builder(
-          kSensorProvider_GetSensor_Name,
-          codec.align(SensorProvider_GetSensor_Params.encodedSize),
-          codec.kMessageExpectsResponse, 0);
-      builder.encodeStruct(SensorProvider_GetSensor_Params, params);
-      var message = builder.finish();
-      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
-        var reader = new codec.MessageReader(message);
-        var responseParams =
-            reader.decodeStruct(SensorProvider_GetSensor_ResponseParams);
-        resolve(responseParams);
-      }).catch(function(result) {
-        reject(Error("Connection error: " + result));
-      });
-    }.bind(this));
-  };
-
-  function SensorProviderStub(delegate) {
-    this.delegate_ = delegate;
-  }
-  SensorProviderStub.prototype.getSensor = function(type) {
-    return this.delegate_ && this.delegate_.getSensor && this.delegate_.getSensor(type);
-  }
-
-  SensorProviderStub.prototype.accept = function(message) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    default:
-      return false;
-    }
-  };
-
-  SensorProviderStub.prototype.acceptWithResponder =
-      function(message, responder) {
-    var reader = new codec.MessageReader(message);
-    switch (reader.messageName) {
-    case kSensorProvider_GetSensor_Name:
-      var params = reader.decodeStruct(SensorProvider_GetSensor_Params);
-      this.getSensor(params.type).then(function(response) {
-        var responseParams =
-            new SensorProvider_GetSensor_ResponseParams();
-        responseParams.result = response.result;
-        responseParams.initParams = response.initParams;
-        var builder = new codec.MessageV1Builder(
-            kSensorProvider_GetSensor_Name,
-            codec.align(SensorProvider_GetSensor_ResponseParams.encodedSize),
-            codec.kMessageIsResponse, reader.requestID);
-        builder.encodeStruct(SensorProvider_GetSensor_ResponseParams,
-                             responseParams);
-        var message = builder.finish();
-        responder.accept(message);
-      });
-      return true;
-    default:
-      return false;
-    }
-  };
-
-  function validateSensorProviderRequest(messageValidator) {
-    var message = messageValidator.message;
-    var paramsClass = null;
-    switch (message.getName()) {
-      case kSensorProvider_GetSensor_Name:
-        if (message.expectsResponse())
-          paramsClass = SensorProvider_GetSensor_Params;
-      break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  function validateSensorProviderResponse(messageValidator) {
-   var message = messageValidator.message;
-   var paramsClass = null;
-   switch (message.getName()) {
-      case kSensorProvider_GetSensor_Name:
-        if (message.isResponse())
-          paramsClass = SensorProvider_GetSensor_ResponseParams;
-        break;
-    }
-    if (paramsClass === null)
-      return validator.validationError.NONE;
-    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
-  }
-
-  var SensorProvider = {
-    name: 'device.mojom.SensorProvider',
-    kVersion: 0,
-    ptrClass: SensorProviderPtr,
-    proxyClass: SensorProviderProxy,
-    stubClass: SensorProviderStub,
-    validateRequest: validateSensorProviderRequest,
-    validateResponse: validateSensorProviderResponse,
-  };
-  SensorProviderStub.prototype.validator = validateSensorProviderRequest;
-  SensorProviderProxy.prototype.validator = validateSensorProviderResponse;
-  exports.SensorCreationResult = SensorCreationResult;
-  exports.SensorInitParams = SensorInitParams;
-  exports.SensorProvider = SensorProvider;
-  exports.SensorProviderPtr = SensorProviderPtr;
-  exports.SensorProviderAssociatedPtr = SensorProviderAssociatedPtr;
-})();
diff --git a/tests/wpt/web-platform-tests/resources/test-only-api.js b/tests/wpt/web-platform-tests/resources/test-only-api.js
index ae3137481da..3fdf1cea6eb 100644
--- a/tests/wpt/web-platform-tests/resources/test-only-api.js
+++ b/tests/wpt/web-platform-tests/resources/test-only-api.js
@@ -31,7 +31,7 @@ function loadScript(path) {
 }
 
 /**
- * A helper for Chromium-based browsers to load Mojo JS bindingds
+ * A helper for Chromium-based browsers to load Mojo JS bindings
  *
  * This is an async function that works in both workers and windows. It first
  * loads mojo_bindings.js, disables automatic dependency loading, and loads all
@@ -39,12 +39,16 @@ function loadScript(path) {
  * successfully, or rejects if any exception is raised. If testharness.js is
  * used, an uncaught exception will terminate the test with a harness error
  * (unless `allow_uncaught_exception` is true), which is usually the desired
- * behaviour. Only call this function if isChromiumBased === true.
+ * behaviour.
+ *
+ * This function also works with Blink web tests loaded from file://, in which
+ * case file:// will be prepended to all '/gen/...' URLs.
+ *
+ * Only call this function if isChromiumBased === true.
  *
  * @param {Array.<string>} resources - A list of scripts to load: Mojo JS
  *   bindings should be of the form '/gen/../*.mojom.js', the ordering of which
- *   does not matter. Do not include mojo_bindings.js in this list. You may
- *   include other non-mojom.js scripts for convenience.
+ *   does not matter. Do not include mojo_bindings.js in this list.
  * @returns {Promise}
  */
 async function loadMojoResources(resources) {
@@ -55,14 +59,26 @@ async function loadMojoResources(resources) {
     return;
   }
 
-  // We want to load mojo_bindings.js separately to set mojo.config.
-  if (resources.some(p => p.endsWith('/mojo_bindings.js'))) {
-    throw new Error('Do not load mojo_bindings.js explicitly.');
+  let genPrefix = '';
+  if (self.location.pathname.includes('/web_tests/')) {
+    // Blink internal web tests
+    genPrefix = 'file://';
   }
-  await loadScript('/gen/layout_test_data/mojo/public/js/mojo_bindings.js');
+
+  for (const path of resources) {
+    // We want to load mojo_bindings.js separately to set mojo.config.
+    if (path.endsWith('/mojo_bindings.js')) {
+      throw new Error('Do not load mojo_bindings.js explicitly.');
+    }
+    if (! /^\/gen\/.*\.mojom\.js$/.test(path)) {
+      throw new Error(`Unrecognized resource path: ${path}`);
+    }
+  }
+
+  await loadScript(genPrefix + '/gen/layout_test_data/mojo/public/js/mojo_bindings.js');
   mojo.config.autoLoadMojomDeps = false;
 
   for (const path of resources) {
-    await loadScript(path);
+    await loadScript(genPrefix + path);
   }
 }
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 2bbc935de40..61eadfeb654 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -2069,7 +2069,7 @@ policies and contribution forms [3].
                 func();
             } else {
                 if(remaining === 0) {
-                    assert(false, "wait_for", description,
+                    assert(false, "step_wait_func", description,
                            "Timed out waiting on condition");
                 }
                 remaining--;
@@ -2084,7 +2084,7 @@ policies and contribution forms [3].
                                                   timeout=3000, interval=100) {
         /**
          * Poll for a function to return true, and invoke a callback
-         * followed this.done() once it does, or assert if a timeout
+         * followed by this.done() once it does, or assert if a timeout
          * is reached. This is preferred over a simple step_timeout
          * whenever possible since it allows the timeout to be longer
          * to reduce intermittents without compromising test execution speed
diff --git a/tests/wpt/web-platform-tests/sanitizer-api/META.yml b/tests/wpt/web-platform-tests/sanitizer-api/META.yml
new file mode 100644
index 00000000000..7ac32665e19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sanitizer-api/META.yml
@@ -0,0 +1,5 @@
+spec: https://wicg.github.io/sanitizer-api/
+suggested_reviewers:
+  - ivanlish
+  - mozfreddyb
+  - otherdaniel
diff --git a/tests/wpt/web-platform-tests/sanitizer-api/idlharness.tentative.window.js b/tests/wpt/web-platform-tests/sanitizer-api/idlharness.tentative.window.js
new file mode 100644
index 00000000000..384317b8e55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sanitizer-api/idlharness.tentative.window.js
@@ -0,0 +1,12 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+idl_test(
+  ['sanitizer-api.tentative'],
+  ['html'],
+  idl_array => {
+    idl_array.add_objects({
+      Sanitizer: ['new Sanitizer({})']
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-config.tentative.html b/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-config.tentative.html
new file mode 100644
index 00000000000..c780bbe21b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-config.tentative.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="support/testcases.sub.js"></script>
+</head>
+
+<body>
+<script>
+    test(t => {
+      let s = new Sanitizer();
+      assert_true(s instanceof Sanitizer);
+      assert_object_equals(s.creationOptions, {});
+    }, "SanitizerAPI creator without config.");
+
+    test(t => {
+      let s = new Sanitizer({});
+      assert_true(s instanceof Sanitizer);
+      assert_object_equals(s.creationOptions, {});
+    }, "SanitizerAPI creator with empty config.");
+
+    test(t => {
+      let s = new Sanitizer(null);
+      assert_true(s instanceof Sanitizer);
+      assert_object_equals(s.creationOptions, {});
+    }, "SanitizerAPI creator with null as config.");
+
+    test(t => {
+      let s = new Sanitizer(undefined);
+      assert_true(s instanceof Sanitizer);
+      assert_object_equals(s.creationOptions, {});
+    }, "SanitizerAPI creator with undefined as config.");
+
+    test(t => {
+      let s = new Sanitizer({testConfig: [1,2,3], attr: ["test", "i", "am"]});
+      assert_true(s instanceof Sanitizer);
+      assert_object_equals(s.creationOptions, {});
+    }, "SanitizerAPI creator with config ignore unknown values.");
+
+    test(t => {
+      let options = {};
+      let s = new Sanitizer(options);
+      assert_true(s instanceof Sanitizer);
+      assert_object_equals(s.creationOptions, {});
+
+      options.testConfig = [1,2,3];
+      assert_object_equals(s.creationOptions, {});
+
+      s.creationOptions = {testConfig: [1,2,3]};
+      assert_object_equals(s.creationOptions, {});
+
+      s.creationOptions['testConfig'] = [1,2,3];
+      assert_object_equals(s.creationOptions, {});
+    }, "SanitizerAPI config is not editable.");
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitize.tentative.html b/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitize.tentative.html
new file mode 100644
index 00000000000..219eff41891
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitize.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="support/testcases.sub.js"></script>
+</head>
+
+<body>
+<script>
+    function getString(fragment) {
+      d = document.createElement("div");
+      d.appendChild(fragment);
+      return d.innerHTML;
+    }
+    const s = new Sanitizer({});
+
+    testcases.forEach(c => test(t => {
+        fragment = s.sanitize(c.value);
+        assert_true(fragment instanceof DocumentFragment);
+        assert_equals(getString(fragment), c.result);
+    }, "SanitizerAPI sanitize function for " + c.message));
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitizeToString.tentative.html b/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitizeToString.tentative.html
new file mode 100644
index 00000000000..98bb4a46018
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sanitizer-api/sanitizer-sanitizeToString.tentative.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="support/testcases.sub.js"></script>
+</head>
+
+<body>
+<script>
+    const s = new Sanitizer({});
+
+    testcases.forEach(c => test(t => {
+        assert_equals(s.sanitizeToString(c.value), c.result);
+    }, "SanitizerAPI sanitizeToString function for " + c.message));
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/sanitizer-api/support/testcases.sub.js b/tests/wpt/web-platform-tests/sanitizer-api/support/testcases.sub.js
new file mode 100644
index 00000000000..d1af1c9b5a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/sanitizer-api/support/testcases.sub.js
@@ -0,0 +1,17 @@
+const testcases = [
+  {value: "test", result: "test", message: "string"},
+  {value: "<b>bla</b>", result: "<b>bla</b>", message: "html fragment"},
+  {value: "<a<embla", result: "", message: "broken html"},
+  {value: {}, result: "[object Object]", message: "empty object"},
+  {value: 1, result: "1", message: "number"},
+  {value: 000, result: "0", message: "zeros"},
+  {value: 1+2, result: "3", message: "arithmetic"},
+  {value: "", result: "", message: "empty string"},
+  {value: undefined, result: "undefined", message: "undefined"},
+  {value: null, result: "null", message: "null"},
+  {value: "<html><head></head><body>test</body></html>", result: "test", message: "document"},
+  {value: "<div>test", result: "<div>test</div>", message: "html without close tag"},
+  {value: "<script>alert('i am a test')<\/script>", result: "", message: "scripts"},
+  {value: "<p onclick='a= 123'>Click.</p>", result: "<p>Click.</p>", message: "onclick scripts"}
+
+];
diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-document-hidden-manual.https.html b/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-document-hidden-manual.https.html
index 550dc831cbc..05368bdfb89 100644
--- a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-document-hidden-manual.https.html
+++ b/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-document-hidden-manual.https.html
@@ -9,6 +9,7 @@
 
 promise_test(async t => {
   const screenWakeLock = await navigator.wakeLock.request('screen');
+  assert_false(screenWakeLock.released, "The released attribute is initially false")
   const screenWakeLockReleased =
       new EventWatcher(t, screenWakeLock, "release").wait_for("release");
 
@@ -16,6 +17,7 @@ promise_test(async t => {
   await eventWatcher.wait_for("visibilitychange");
   assert_true(document.hidden, "document is hidden after the visibilitychange event");
   await screenWakeLockReleased;
+  assert_true(screenWakeLock.released, "The released attribute is true after the lock is released");
   await promise_rejects_dom(t, "NotAllowedError", navigator.wakeLock.request('screen'),
       "new screen locks are not allowed when the page is not visible");
 
diff --git a/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-released.https.html b/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-released.https.html
new file mode 100644
index 00000000000..13520578527
--- /dev/null
+++ b/tests/wpt/web-platform-tests/screen-wake-lock/wakelock-released.https.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<link rel="help" href="https://w3c.github.io/screen-wake-lock/#dom-wakelocksentinel-released">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script>
+promise_test(async t => {
+  await test_driver.set_permission({name: 'screen-wake-lock'}, 'granted', false);
+
+  const lock = await navigator.wakeLock.request("screen");
+  assert_false(lock.released, "lock.release must be false on creation");
+
+  const watcher = new EventWatcher(t, lock, "release");
+
+  lock.release();
+  assert_false(lock.released, "WakeLockSentinel.release does not become true immediately");
+
+  await watcher.wait_for("release");
+  assert_true(lock.released, "lock.release must be true after calling release()");
+}, "Basic WakeLockSentinel.released functionality");
+
+promise_test(async t => {
+  await test_driver.set_permission({ name: 'screen-wake-lock' }, 'granted', false);
+
+  const lock = await navigator.wakeLock.request("screen");
+  assert_false(lock.released, "lock.release must be false on creation");
+
+  return new Promise(resolve => {
+    lock.onrelease = t.step_func(ev => {
+      assert_true(lock.released, "WakeLockSentinel.release is true in an onrelease event handler");
+      resolve();
+    });
+    lock.release();
+    assert_false(lock.released, "WakeLockSentinel.release does not become true immediately")
+  })
+}, "The release attribute inside an event handler");
+</script>
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html b/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html
index 881396adbc3..93b27b46556 100644
--- a/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html
+++ b/tests/wpt/web-platform-tests/screen_enumeration/getScreens.values.https.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset='utf-8'>
-<title>Screen Enumeration: getScreens() tentative</title>
+<title>Window Placement: getScreens() tentative</title>
 <!-- TODO: update link to W3C whenever specifications are ready -->
-<link rel='help' href='https://github.com/webscreens/screen-enumeration'/>
+<link rel='help' href='https://github.com/webscreens/window-placement'/>
 <script src='/resources/testharness.js'></script>
 <script src='/resources/testharnessreport.js'></script>
 <script src='resources/screenenumeration-helpers.js'></script>
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/isMultiScreen.values.https.html b/tests/wpt/web-platform-tests/screen_enumeration/isMultiScreen.values.https.html
index 5146803ea9c..2a79db4e10e 100644
--- a/tests/wpt/web-platform-tests/screen_enumeration/isMultiScreen.values.https.html
+++ b/tests/wpt/web-platform-tests/screen_enumeration/isMultiScreen.values.https.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset='utf-8'>
-<title>Screen Enumeration: isMultiScreen() tentative</title>
+<title>Window Placement: isMultiScreen() tentative</title>
 <!-- TODO: update link to W3C whenever specifications are ready -->
-<link rel='help' href='https://github.com/webscreens/screen-enumeration'/>
+<link rel='help' href='https://github.com/webscreens/window-placement'/>
 <script src='/resources/testharness.js'></script>
 <script src='/resources/testharnessreport.js'></script>
 <script src='resources/screenenumeration-helpers.js'></script>
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js b/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js
index d96fca74b5d..7d5d5221943 100644
--- a/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js
+++ b/tests/wpt/web-platform-tests/screen_enumeration/resources/screenenumeration-helpers.js
@@ -6,45 +6,40 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 
-const loadChromiumResources = async () => {
-  if (!("MojoInterfaceInterceptor" in self)) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
-
-  const resources = [
-    "/gen/layout_test_data/mojo/public/js/mojo_bindings.js",
-    "/gen/ui/gfx/mojom/color_space.mojom.js",
-    "/gen/ui/gfx/mojom/buffer_types.mojom.js",
-    "/gen/ui/gfx/mojom/display_color_spaces.mojom.js",
-    "/gen/ui/gfx/geometry/mojom/geometry.mojom.js",
-    "/gen/ui/display/mojom/display.mojom.js",
-    "/gen/third_party/blink/public/mojom/screen_enumeration/screen_enumeration.mojom.js",
-    "/resources/testdriver.js",
-    "/resources/testdriver-vendor.js",
-    "/resources/chromium/mock-screenenumeration.js",
+async function loadChromiumResources() {
+  const chromiumResources = [
+    '/gen/ui/gfx/mojom/color_space.mojom.js',
+    '/gen/ui/gfx/mojom/buffer_types.mojom.js',
+    '/gen/ui/gfx/mojom/display_color_spaces.mojom.js',
+    '/gen/ui/gfx/geometry/mojom/geometry.mojom.js',
+    '/gen/ui/display/mojom/display.mojom.js',
+    '/gen/third_party/blink/public/mojom/screen_enumeration/screen_enumeration.mojom.js'
   ];
-  await Promise.all(resources.map(path => {
-    const script = document.createElement("script");
-    script.src = path;
-    script.async = false;
-    const promise = new Promise((resolve, reject) => {
-      script.onload = resolve;
-      script.onerror = reject;
-    });
-    document.head.appendChild(script);
-    return promise;
-  }));
 
-};
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/testdriver.js');
+  await loadScript('/resources/testdriver-vendor.js');
+  await loadScript('/resources/chromium/mock-screenenumeration.js');
+}
 
 async function initialize_screen_enumeration_tests() {
-  if (typeof ScreenEnumerationTest === "undefined")
-    await loadChromiumResources();
+  if (typeof ScreenEnumerationTest === "undefined") {
+    const script = document.createElement('script');
+    script.src = '/resources/test-only-api.js';
+    script.async = false;
+    const p = new Promise((resolve, reject) => {
+      script.onload = () => { resolve(); };
+      script.onerror = e => { reject(e); };
+    });
+    document.head.appendChild(script);
+    await p;
 
-  assert_true(typeof ScreenEnumerationTest !== "undefined",
-              "Screen Enumeration testing interface is not available.");
+    if (isChromiumBased) {
+      await loadChromiumResources();
+    }
+  }
+  assert_implements(ScreenEnumerationTest,
+                    'Screen Enumeration testing interface is not available.');
   let enumTest = new ScreenEnumerationTest();
   await enumTest.initialize();
   return enumTest;
diff --git a/tests/wpt/web-platform-tests/scroll-animations/constructor.html b/tests/wpt/web-platform-tests/scroll-animations/constructor.html
index 7cb7013c006..eae6278f71b 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/constructor.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/constructor.html
@@ -25,6 +25,16 @@
 <script>
 'use strict';
 
+function formatOffset(v) {
+  if (typeof(v) == 'object')
+    return `${v.constructor.name}(${v.toString()})`;
+  return `'${v.toString()}'`;
+}
+
+function assert_offsets_equal(a, b) {
+  assert_equals(formatOffset(a), formatOffset(b));
+}
+
 // TODO(smcgruer): In many of the tests below, timeRange is specified when it
 // should not need to be. This is an artifact of the initial Chrome
 // implementation which doesn't support timeRange: 'auto'. These should be
@@ -49,13 +59,14 @@ test(t => {
 test(t => {
   assert_equals(
       new ScrollTimeline({scrollSource: null, timeRange: 100}).scrollSource,
-      document.scrollingElement);
-  // The default value for scrollSource should also map to the
-  // document.scrollingElement.
+      null);
+}, 'A ScrollTimeline created with a null scrollSource should have no scrollSource');
+
+test(t => {
   assert_equals(
       new ScrollTimeline({timeRange: 100}).scrollSource,
       document.scrollingElement);
-}, 'A ScrollTimeline created with a null scrollSource should use the document.scrollingElement');
+}, 'A ScrollTimeline created without a scrollSource should use the document.scrollingElement');
 
 // orientation
 
@@ -95,17 +106,18 @@ test(t => {
 // startScrollOffset and endScrollOffset
 
 test(t => {
-  assert_equals(new ScrollTimeline({timeRange: 100}).startScrollOffset, 'auto');
-}, 'A ScrollTimeline created with the default startScrollOffset should default to \'auto\'');
+  assert_offsets_equal(new ScrollTimeline({timeRange: 100}).startScrollOffset, new CSSKeywordValue('auto'));
+}, 'A ScrollTimeline created with the default startScrollOffset should default to CSSKeywordValue(auto)');
 
 test(t => {
-  assert_equals(new ScrollTimeline({timeRange: 100}).endScrollOffset, 'auto');
-}, 'A ScrollTimeline created with the default endScrollOffset should default to \'auto\'');
+  assert_offsets_equal(new ScrollTimeline({timeRange: 100}).endScrollOffset, new CSSKeywordValue('auto'));
+}, 'A ScrollTimeline created with the default endScrollOffset should default to CSSKeywordValue(auto)');
 
 const gValidScrollOffsetValues = [
-  'auto',
-  0,
-  'calc(100% - 80px)',
+  new CSSKeywordValue('auto'),
+  CSS.px(0),
+  CSS.percent(100).sub(CSS.px(80)),
+  "auto",
 ];
 
 const gValidScrollOffsetSuffixes = [
@@ -135,23 +147,24 @@ for (let offset of gValidScrollOffsetValues) {
     const scrollTimeline = new ScrollTimeline(
         {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset});
 
-    // Special case for 0; this is a valid value, but like computed style will
-    // be output as '0px' when queried.
-    if (offset === 0) offset = '0px';
+    // Special case for 'auto'. This is valid input because of CSSKeywordish,
+    // but when read back we expect a real CSSKeywordValue.
+    if (offset === 'auto')
+      offset = new CSSKeywordValue('auto');
 
-    assert_equals(scrollTimeline.startScrollOffset, offset);
-    assert_equals(scrollTimeline.endScrollOffset, offset);
-  }, '\'' + offset + '\' is a valid scroll offset value');
+    assert_offsets_equal(scrollTimeline.startScrollOffset, offset);
+    assert_offsets_equal(scrollTimeline.endScrollOffset, offset);
+  }, formatOffset(offset) + ' is a valid scroll offset value');
 }
 
 for (const suffix of gValidScrollOffsetSuffixes) {
   test(function() {
-    const offset = '75' + suffix;
+    const offset = new CSSUnitValue(75, suffix);
     const scrollTimeline = new ScrollTimeline(
         {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset});
 
-    assert_equals(scrollTimeline.startScrollOffset, offset);
-    assert_equals(scrollTimeline.endScrollOffset, offset);
+    assert_offsets_equal(scrollTimeline.startScrollOffset, offset);
+    assert_offsets_equal(scrollTimeline.endScrollOffset, offset);
   }, '\'' + suffix + '\' is a valid scroll offset unit');
 }
 
@@ -165,8 +178,14 @@ const gInvalidScrollOffsetValues = [
   'rgb(0, 128, 0)',
   'url("http://www.example.com/pinkish.gif")',
   'this_is_garbage',
+  CSS.number(0),
   // Multiple valid values.
   '100px 5%',
+  // Values that would be valid if represented with CSS Typed OM:
+   0,
+   '10px',
+   '10%',
+   'calc(100% - 80px)',
 ];
 
 const gInvalidScrollOffsetSuffixes = [
@@ -183,7 +202,7 @@ for (const offset of gInvalidScrollOffsetValues) {
           {timeRange: 100, startScrollOffset: offset, endScrollOffset: offset})
     };
     assert_throws_js(TypeError, constructorFunc);
-  }, '\'' + offset + '\' is an invalid scroll offset value');
+  }, formatOffset(offset) + ' is an invalid scroll offset value');
 }
 
 for (const suffix of gInvalidScrollOffsetSuffixes) {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html
index 799b1460dc1..4510916a132 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/constructor.tentative.html
@@ -25,6 +25,16 @@
 <script>
 'use strict';
 
+function formatOffset(v) {
+  if (typeof(v) == 'object')
+    return `${v.constructor.name}(${v.toString()})`;
+  return `'${v.toString()}'`;
+}
+
+function assert_offsets_equal(a, b) {
+  assert_equals(formatOffset(a), formatOffset(b));
+}
+
 test(t => {
   assert_array_equals(new ScrollTimeline({timeRange: 100}).scrollOffsets, []);
 }, 'A ScrollTimeline created with the default scrollOffsets should default to []');
@@ -34,7 +44,9 @@ test(t => {
 }, 'A ScrollTimeline created with empty scrollOffsets should resolve to []');
 
 test(t => {
-  assert_array_equals(new ScrollTimeline({timeRange: 100, scrollOffsets: ['20%', 'auto']}).scrollOffsets, ['20%', 'auto']);
+  let offsets = new ScrollTimeline({timeRange: 100, scrollOffsets: [CSS.percent(20), 'auto']}).scrollOffsets;
+  assert_offsets_equal(offsets[0], CSS.percent(20));
+  assert_offsets_equal(offsets[1], new CSSKeywordValue('auto'));
 }, 'A ScrollTimeline created with last \'auto\' offset in scrollOffsets should be allowed.');
 
 test(t => {
@@ -52,8 +64,8 @@ test(t => {
 }, 'Creating a ScrollTimeline with an scrollOffsets value of [\'auto\'] should throw');
 
 const gValidScrollOffsetValues = [
-  0,
-  'calc(100% - 80px)',
+  CSS.px(0),
+  CSS.percent(100).sub(CSS.px(80)),
 ];
 
 const gValidScrollOffsetSuffixes = [
@@ -83,21 +95,24 @@ for (let offset of gValidScrollOffsetValues) {
     const scrollTimeline = new ScrollTimeline(
         {timeRange: 100, scrollOffsets: [offset, offset]});
 
-    // Special case for 0; this is a valid value, but like computed style will
-    // be output as '0px' when queried.
-    if (offset === 0) offset = '0px';
+    // Special case for 'auto'. This is valid input because of CSSKeywordish,
+    // but when read back we expect a real CSSKeywordValue.
+    if (offset === 'auto')
+      offset = new CSSKeywordValue('auto');
 
-    assert_array_equals(scrollTimeline.scrollOffsets, [offset, offset]);
+    assert_offsets_equal(scrollTimeline.scrollOffsets[0], offset);
+    assert_offsets_equal(scrollTimeline.scrollOffsets[1], offset);
   }, '\'' + offset + '\' is a valid scroll offset value');
 }
 
 for (const suffix of gValidScrollOffsetSuffixes) {
   test(function() {
-    const offset = '75' + suffix;
+    const offset = new CSSUnitValue(75, suffix);
     const scrollTimeline = new ScrollTimeline(
         {timeRange: 100, scrollOffsets: [offset, offset]});
 
-    assert_array_equals(scrollTimeline.scrollOffsets, [offset, offset]);
+    assert_offsets_equal(scrollTimeline.scrollOffsets[0], offset);
+    assert_offsets_equal(scrollTimeline.scrollOffsets[1], offset);
   }, '\'' + suffix + '\' is a valid scroll offset unit');
 }
 
@@ -111,8 +126,14 @@ const gInvalidScrollOffsetValues = [
   'rgb(0, 128, 0)',
   'url("http://www.example.com/pinkish.gif")',
   'this_is_garbage',
+  CSS.number(0),
   // Multiple valid values.
   '100px 5%',
+  // Values that would be valid if represented with CSS Typed OM:
+   0,
+   '10px',
+   '10%',
+   'calc(100% - 80px)',
 ];
 
 const gInvalidScrollOffsetSuffixes = [
@@ -129,7 +150,7 @@ for (const offset of gInvalidScrollOffsetValues) {
           {timeRange: 100, scrollOffsets: ['0px', offset]})
     };
     assert_throws_js(TypeError, constructorFunc);
-  }, '\'' + offset + '\' is an invalid scroll offset value in scrollOffsets');
+  }, formatOffset(offset) + ' is an invalid scroll offset value in scrollOffsets');
 }
 
 for (const suffix of gInvalidScrollOffsetSuffixes) {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
new file mode 100644
index 00000000000..7b30ec611f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-shorthand.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-shorthand">
+<link rel="help" href="https://drafts.csswg.org/css-animations-2/#animation-timeline">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+<script src="/css/support/shorthand-testcommon.js"></script>
+<div id="target"></div>
+<script>
+test_valid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim');
+test_valid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim timeline');
+test_valid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim none');
+test_valid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim "initial"');
+test_valid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim auto',
+  '1s linear 1s 2 reverse forwards paused anim');
+
+test_invalid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim initial');
+test_invalid_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim 2000');
+
+test_computed_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim');
+test_computed_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim timeline');
+test_computed_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim none');
+test_computed_value('animation',
+  '1s linear 1s 2 reverse forwards paused anim auto',
+  '1s linear 1s 2 reverse forwards paused anim');
+
+test_shorthand_value('animation',
+  `1s linear 1s 2 reverse forwards paused anim1 timeline,
+   1s linear 1s 2 reverse forwards paused anim2 none,
+   1s linear 1s 2 reverse forwards paused anim3 auto`,
+{
+  'animation-duration': '1s, 1s, 1s',
+  'animation-timing-function': 'linear, linear, linear',
+  'animation-delay': '1s, 1s, 1s',
+  'animation-iteration-count': '2, 2, 2',
+  'animation-direction': 'reverse, reverse, reverse',
+  'animation-fill-mode': 'forwards, forwards, forwards',
+  'animation-play-state': 'paused, paused, paused',
+  'animation-name': 'anim1, anim2, anim3',
+  'animation-timeline': 'timeline, none, auto'
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-in-keyframe.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-in-keyframe.html
index bdf40e0747f..75483331390 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-in-keyframe.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-in-keyframe.html
@@ -7,11 +7,10 @@
 <style>
   @keyframes test {
     from { width: 100px; animation-timeline: foo; }
-    to { width: 100px: animation-timeline: foo; }
+    to { width: 100px; animation-timeline: foo; }
   }
   #target {
     width: 50px;
-    animation-timeline: bar;
     animation-name: test;
     animation-duration: 1s;
     animation-play-state: paused;
@@ -23,6 +22,6 @@ test(() => {
   let style = getComputedStyle(document.getElementById('target'));
   // Checking 'width' verifies that the animation is applied at all.
   assert_equals(style.width, '100px');
-  assert_equals(style.animationTimeline, 'bar');
+  assert_equals(style.animationTimeline, 'auto');
 }, 'The animation-timeline property may not be used in keyframes');
 </script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-none.html b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-none.html
new file mode 100644
index 00000000000..d5d585366c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/animation-timeline-none.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<link rel="help" src="https://drafts.csswg.org/css-animations-2/#typedef-timeline-name">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+  @keyframes expand {
+    from { width: 100px; }
+    to { width: 200px; }
+  }
+
+  .test, #ref {
+    width: 0px;
+    animation-name: expand;
+    animation-duration: 10s;
+    animation-play-state: paused;
+  }
+
+  #element_timeline_none {
+    animation-timeline: none;
+  }
+  #element_unknown_timeline {
+    animation-timeline: unknown_timeline;
+  }
+
+</style>
+<div class=test id=element_timeline_none></div>
+<div class=test id=element_unknown_timeline></div>
+<div id=ref></div>
+<script>
+  promise_test(async (t) => {
+    assert_equals(getComputedStyle(element_timeline_none).width, '0px');
+    assert_equals(getComputedStyle(ref).width, '100px');
+    await waitForNextFrame();
+    assert_equals(getComputedStyle(element_timeline_none).width, '0px');
+    assert_equals(getComputedStyle(ref).width, '100px');
+  }, 'Animation with animation-timeline:none has no effect value');
+
+  promise_test(async (t) => {
+    assert_equals(getComputedStyle(element_unknown_timeline).width, '0px');
+    assert_equals(getComputedStyle(ref).width, '100px');
+    await waitForNextFrame();
+    assert_equals(getComputedStyle(element_unknown_timeline).width, '0px');
+    assert_equals(getComputedStyle(ref).width, '100px');
+  }, 'Animation with unknown timeline name has no effect value');
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html
new file mode 100644
index 00000000000..884f2ab5ed7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-element-offsets.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<title>@scroll-timeline: Element-based offsets</title>
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#scroll-timeline-at-rule">
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#element-based-offset-section">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<style>
+  #scroller {
+    overflow: scroll;
+    width: 100px;
+    height: 100px;
+  }
+  .filler {
+    height: 150px;
+    background-color: darkgray;
+  }
+  .offset {
+    height: 50px;
+    background-color: green;
+  }
+  @keyframes expand {
+    from { width: 100px; }
+    to { width: 200px; }
+  }
+  @scroll-timeline timeline_start_start {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset1);
+    end: selector(#offset2);
+  }
+  @scroll-timeline timeline_end_end {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset1) end;
+    end: selector(#offset2) end;
+  }
+  @scroll-timeline timeline_end_start {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset1) end;
+    end: selector(#offset2) start;
+  }
+  @scroll-timeline timeline_end_1_end {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset1) end 1;
+    end: selector(#offset2) end;
+  }
+  @scroll-timeline timeline_end_start_05 {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset1) end;
+    end: selector(#offset2) 0.5;
+  }
+  @scroll-timeline timeline_start_400px {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset1);
+    end: 400px;
+  }
+  @scroll-timeline timeline_50px_end {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: 50px;
+    end: selector(#offset2) end;
+  }
+  @scroll-timeline timeline_outside {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset_outside);
+    end: auto;
+  }
+  @scroll-timeline timeline_display_none {
+    source: selector(#scroller);
+    time-range: 10s;
+    start: selector(#offset_display_none);
+    end: auto;
+  }
+
+  #container > div {
+    width: 0px;
+    animation-name: expand;
+    animation-duration: 10s;
+    animation-timing-function: linear;
+  }
+  /* Ensure stable expectations if feature is not supported */
+  @supports not (animation-timeline:foo) {
+    #container > div { animation-play-state: paused; }
+  }
+  #element_start_start { animation-timeline: timeline_start_start; }
+  #element_end_end { animation-timeline: timeline_end_end; }
+  #element_end_start { animation-timeline: timeline_end_start; }
+  #element_end_1_end { animation-timeline: timeline_end_1_end; }
+  #element_end_start_05 { animation-timeline: timeline_end_start_05; }
+  #element_start_400px { animation-timeline: timeline_start_400px; }
+  #element_50px_end { animation-timeline: timeline_50px_end; }
+  #element_outside { animation-timeline: timeline_outside; }
+  #element_display_none { animation-timeline: timeline_display_none; }
+</style>
+<div id=scroller>
+  <div id=contents>
+    <div class=filler></div>
+    <div class=offset id=offset1></div>
+    <div class=filler></div>
+    <div class=offset id=offset2></div>
+    <div class=filler></div>
+  </div>
+</div>
+<div id=offset_outside></div>
+<div id=offset_display_none style="display:none"></div>
+<div id=container>
+  <div id=element_start_start></div>
+  <div id=element_end_end></div>
+  <div id=element_end_start></div>
+  <div id=element_end_1_end></div>
+  <div id=element_end_start_05></div>
+  <div id=element_start_400px></div>
+  <div id=element_50px_end></div>
+  <div id=element_outside></div>
+  <div id=element_display_none></div>
+</div>
+<script>
+
+  // The contents of the scroller looks approximately like this:
+  //
+  //  +-------+
+  //  |       |
+  //  | 150px | filler
+  //  |       |
+  //  +-------+
+  //  +-------+
+  //  | 50px  | #offset1
+  //  +-------+
+  //  +-------+
+  //  |       |
+  //  | 150px | filler
+  //  |       |
+  //  +-------+
+  //  +-------+
+  //  | 50px  | #offset2
+  //  +-------+
+  //  +-------+
+  //  |       |
+  //  | 150px | filler
+  //  |       |
+  //  +-------+
+  //
+  // The height of the scrollport is 100px.
+
+  // Scrolls top to 'offset', waits for a frame, then call the provided
+  // assertions function.
+  function test_scroll(element, offset, assertions, description) {
+    promise_test(async (t) => {
+      scroller.scrollTop = offset;
+      await waitForNextFrame();
+      assertions();
+    }, `${description} [${element.id}]`);
+  }
+
+  // Tests that the computed value of 'width' on element is the expected value
+  // after scrolling top to the specifed offset.
+  function test_width_at_scroll_top(element, offset, expected) {
+    test_scroll(element, offset, () => {
+      assert_equals(getComputedStyle(element).width, expected);
+    }, `Scroll at offset ${offset} updates animation correctly`);
+  }
+
+  // [200, 400]
+  test_width_at_scroll_top(element_start_start, 0, '0px');
+  test_width_at_scroll_top(element_start_start, 199, '0px');
+  test_width_at_scroll_top(element_start_start, 200, '100px');
+  test_width_at_scroll_top(element_start_start, 300, '150px');
+  test_width_at_scroll_top(element_start_start, 398, '199px');
+  test_width_at_scroll_top(element_start_start, 400, '0px');
+
+  // [50, 250]
+  test_width_at_scroll_top(element_end_end, 0, '0px');
+  test_width_at_scroll_top(element_end_end, 49, '0px');
+  test_width_at_scroll_top(element_end_end, 50, '100px');
+  test_width_at_scroll_top(element_end_end, 150, '150px');
+  test_width_at_scroll_top(element_end_end, 248, '199px');
+  test_width_at_scroll_top(element_end_end, 250, '0px');
+
+  // [50, 400]
+  test_width_at_scroll_top(element_end_start, 0, '0px');
+  test_width_at_scroll_top(element_end_start, 49, '0px');
+  test_width_at_scroll_top(element_end_start, 50, '100px');
+  test_width_at_scroll_top(element_end_start, 225, '150px');
+  test_width_at_scroll_top(element_end_start, 393, '198px');
+  test_width_at_scroll_top(element_end_start, 400, '0px');
+
+  // [100, 250]
+  test_width_at_scroll_top(element_end_1_end, 0, '0px');
+  test_width_at_scroll_top(element_end_1_end, 99, '0px');
+  test_width_at_scroll_top(element_end_1_end, 100, '100px');
+  test_width_at_scroll_top(element_end_1_end, 175, '150px');
+  test_width_at_scroll_top(element_end_1_end, 247, '198px');
+  test_width_at_scroll_top(element_end_1_end, 250, '0px');
+
+  // [50, 375]
+  test_width_at_scroll_top(element_end_start_05, 0, '0px');
+  test_width_at_scroll_top(element_end_start_05, 49, '0px');
+  test_width_at_scroll_top(element_end_start_05, 50, '100px');
+  test_width_at_scroll_top(element_end_start_05, 206, '148px');
+  test_width_at_scroll_top(element_end_start_05, 362, '196px');
+  test_width_at_scroll_top(element_end_start_05, 375, '0px');
+
+  // [200, 300]
+  test_width_at_scroll_top(element_start_400px, 0, '0px');
+  test_width_at_scroll_top(element_start_400px, 199, '0px');
+  test_width_at_scroll_top(element_start_400px, 200, '100px');
+  test_width_at_scroll_top(element_start_400px, 300, '150px');
+  test_width_at_scroll_top(element_start_400px, 398, '199px');
+  test_width_at_scroll_top(element_start_400px, 400, '0px');
+
+  // [50, 250]
+  test_width_at_scroll_top(element_50px_end, 0, '0px');
+  test_width_at_scroll_top(element_50px_end, 49, '0px');
+  test_width_at_scroll_top(element_50px_end, 50, '100px');
+  test_width_at_scroll_top(element_50px_end, 150, '150px');
+  test_width_at_scroll_top(element_50px_end, 248, '199px');
+  test_width_at_scroll_top(element_50px_end, 250, '0px');
+
+  // Offset not a decendant of scroller (=> no effect value)
+  test_width_at_scroll_top(element_outside, 0, '0px');
+  test_width_at_scroll_top(element_outside, 100, '0px');
+  test_width_at_scroll_top(element_outside, 200, '0px');
+  test_width_at_scroll_top(element_outside, 300, '0px');
+  test_width_at_scroll_top(element_outside, 400, '0px');
+  test_width_at_scroll_top(element_outside, 450, '0px');
+
+  // Target of element-based offset has no layout box (=> no effect value)
+  test_width_at_scroll_top(element_display_none, 0, '0px');
+  test_width_at_scroll_top(element_display_none, 100, '0px');
+  test_width_at_scroll_top(element_display_none, 200, '0px');
+  test_width_at_scroll_top(element_display_none, 300, '0px');
+  test_width_at_scroll_top(element_display_none, 400, '0px');
+  test_width_at_scroll_top(element_display_none, 450, '0px');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html
index 2c76f7a1117..9bc49d284b8 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-orientation.html
@@ -55,7 +55,9 @@
   }
   #container > div {
     width: 0px;
-    animation: expand 10s linear;
+    animation-name: expand;
+    animation-duration: 10s;
+    animation-timing-function: linear;
   }
   /* Ensure stable expectations if feature is not supported */
   @supports not (animation-timeline:foo) {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source.html
index f2c50a1cd38..ed24d186579 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-source.html
@@ -64,7 +64,9 @@
   }
   #container > div {
     width: 0px;
-    animation: expand 10s linear;
+    animation-name: expand;
+    animation-duration: 10s;
+    animation-timing-function: linear;
   }
   /* Ensure stable expectations if feature is not supported */
   @supports not (animation-timeline:foo) {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-start-end.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-start-end.html
index fbe53d0fc0c..c53de5d865f 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-start-end.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-start-end.html
@@ -61,7 +61,9 @@
   }
   #container > div {
     width: 0px;
-    animation: expand 10s linear;
+    animation-name: expand;
+    animation-duration: 10s;
+    animation-timing-function: linear;
   }
   /* Ensure stable expectations if feature is not supported */
   @supports not (animation-timeline:foo) {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-time-range.html b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-time-range.html
index 407e17f0748..2a57ed456a2 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-time-range.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/at-scroll-timeline-time-range.html
@@ -37,7 +37,9 @@
   }
   #container > div {
     width: 0px;
-    animation: expand 10s linear;
+    animation-name: expand;
+    animation-duration: 10s;
+    animation-timing-function: linear;
   }
   /* Ensure stable expectations if feature is not supported */
   @supports not (animation-timeline:foo) {
diff --git a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-cssom.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-cssom.tentative.html
index 09ec90a0449..d9e4cc08cbe 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-cssom.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/css/scroll-timeline-cssom.tentative.html
@@ -163,7 +163,19 @@ test_offsets('', 'auto');
 test_offsets('red', 'auto');
 test_offsets('#fff', 'auto');
 test_offsets('unset', 'auto');
-test_offsets('selector(#foo)', 'auto');
+test_offsets('unknown(#foo)', 'auto');
+test_offsets('start', 'auto');
+test_offsets('end', 'auto');
+test_offsets('3', 'auto');
+test_offsets('selector(#foo)');
+test_offsets(' selector(#foo)', 'selector(#foo)');
+test_offsets('selector(#foo) start');
+test_offsets('selector(#foo) start 3');
+test_offsets('selector(#foo) 3');
+test_offsets('selector(#foo) 3.5');
+test_offsets('selector(#foo) end');
+test_offsets('selector(#foo) end 3');
+test_offsets('selector(#foo) 3 end', 'selector(#foo) end 3');
 
 // CSSScrollTimelineRule.timeRange
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/current-time-writing-modes.html b/tests/wpt/web-platform-tests/scroll-animations/current-time-writing-modes.html
index 5a53d43f037..c5c1fe155a8 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/current-time-writing-modes.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/current-time-writing-modes.html
@@ -190,19 +190,19 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'horizontal',
-    startScrollOffset: '20px'
+    startScrollOffset: CSS.px(20)
   });
   const percentageScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'horizontal',
-    startScrollOffset: '20%'
+    startScrollOffset: CSS.percent(20)
   });
   const calcScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'horizontal',
-    startScrollOffset: 'calc(20% - 5px)'
+    startScrollOffset: CSS.percent(20).sub(CSS.px(5))
   });
 
   // Unscrolled, all timelines should read a current time of 0, since
@@ -293,19 +293,19 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'horizontal',
-    endScrollOffset: (scrollerSize - 20) + 'px'
+    endScrollOffset: CSS.px(scrollerSize - 20)
   });
   const percentageScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'horizontal',
-    endScrollOffset: '80%'
+    endScrollOffset: CSS.percent(80)
   });
   const calcScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'horizontal',
-    endScrollOffset: 'calc(80% + 5px)'
+    endScrollOffset: CSS.percent(80).add(CSS.px(5))
   });
 
   // With direction rtl offsets are inverted, such that scrollLeft == 0
@@ -393,19 +393,19 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: scrollerSize + 'px'
+    endScrollOffset: CSS.px(scrollerSize)
   });
   const inclusivePercentageScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: '100%'
+    endScrollOffset: CSS.percent(100)
   });
   const inclusiveCalcScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: 'calc(80% + ' + (0.2 * scrollerSize) + 'px)'
+    endScrollOffset: CSS.percent(80).sub(CSS.px(0.2 * scrollerSize))
   });
 
   // With direction rtl offsets are inverted, such that scrollLeft ==
diff --git a/tests/wpt/web-platform-tests/scroll-animations/current-time.html b/tests/wpt/web-platform-tests/scroll-animations/current-time.html
index ad489d02811..cbe2d8d6005 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/current-time.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/current-time.html
@@ -97,19 +97,19 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    startScrollOffset: '20px'
+    startScrollOffset: CSS.px(20)
   });
   const percentageScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    startScrollOffset: '20%'
+    startScrollOffset: CSS.percent(20)
   });
   const calcScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    startScrollOffset: 'calc(20% - 5px)'
+    startScrollOffset: CSS.percent(20).sub(CSS.px(5))
   });
 
   // Unscrolled all timelines should read a current time of 0, as the
@@ -242,19 +242,19 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: scrollerSize + 'px'
+    endScrollOffset: CSS.px(scrollerSize)
   });
   const inclusivePercentageScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: '100%'
+    endScrollOffset: CSS.percent(100)
   });
   const inclusiveCalcScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: 'calc(80% + ' + (0.2 * scrollerSize) + 'px)'
+    endScrollOffset: CSS.percent(80).add(CSS.px(0.2 * scrollerSize))
   });
 
   scroller.scrollTop = scrollerSize;
@@ -290,19 +290,19 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: (scrollerSize - 20) + 'px'
+    endScrollOffset: CSS.px(scrollerSize - 20)
   });
   const percentageScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: '80%'
+    endScrollOffset: CSS.percent(80)
   });
   const calcScrollTimeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    endScrollOffset: 'calc(80% + 5px)'
+    endScrollOffset: CSS.percent(80).add(CSS.px(5))
   });
 
   // Check the length-based ScrollTimeline.
@@ -403,8 +403,8 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    startScrollOffset: '20px',
-    endScrollOffset: (scrollerSize - 50) + 'px'
+    startScrollOffset: CSS.px(20),
+    endScrollOffset: CSS.px(scrollerSize - 50)
   });
 
   scroller.scrollTop = 150;
@@ -427,8 +427,8 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    startScrollOffset: '20px',
-    endScrollOffset: '20px',
+    startScrollOffset: CSS.px(20),
+    endScrollOffset: CSS.px(20)
   });
 
   scroller.scrollTop = 150;
@@ -449,8 +449,8 @@ promise_test(async t => {
     scrollSource: scroller,
     timeRange: scrollerSize,
     orientation: 'block',
-    startScrollOffset: '50px',
-    endScrollOffset: '10px',
+    startScrollOffset: CSS.px(50),
+    endScrollOffset: CSS.px(10)
   });
 
   scroller.scrollTop = 40;
@@ -462,4 +462,87 @@ promise_test(async t => {
   await waitForNextFrame();
   assert_equals(scrollTimeline.currentTime, scrollTimeline.timeRange);
 }, 'currentTime handles startScrollOffset > endScrollOffset correctly');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  // Set the timeRange such that currentTime maps directly to the value
+  // scrolled. The contents and scroller are square, so it suffices to compute
+  // one edge and use it for all the timelines.
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  const scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    timeRange: scrollerSize,
+    orientation: 'block',
+    scrollOffsets: [CSS.px(10), CSS.px(20), CSS.px(40), CSS.px(70), CSS.px(90)],
+  });
+
+  var offset = 0;
+  var w = 1 / 4; // offset weight
+  var p = 0;         // progress within the offset
+
+  scroller.scrollTop = 10;
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (12 - 10) / (20 - 10);
+  scroller.scrollTop = 12;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 1;
+  p = 0;
+  scroller.scrollTop = 20;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (35 - 20) / (40 - 20);
+  scroller.scrollTop = 35;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 2;
+  p = 0;
+  scroller.scrollTop = 40;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (60 - 40) / (70 - 40);
+  scroller.scrollTop = 60;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 3;
+  p = 0;
+  scroller.scrollTop = 70;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (80 - 70) / (90 - 70);
+  scroller.scrollTop = 80;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, (offset + p) * w * scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  scroller.scrollTop = 90;
+  await waitForNextFrame();
+  assert_times_equal(
+    scrollTimeline.currentTime, scrollerSize,
+    "current time calculation when scroll = " + scroller.scrollTop);
+}, 'currentTime calculations when multiple scroll offsets are specified');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/layout-changes-on-percentage-based-timeline.html b/tests/wpt/web-platform-tests/scroll-animations/layout-changes-on-percentage-based-timeline.html
index 4884715255c..19fce372133 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/layout-changes-on-percentage-based-timeline.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/layout-changes-on-percentage-based-timeline.html
@@ -64,8 +64,8 @@ layout changes on percentage-based scroll offset">
   const timeline = new ScrollTimeline({
     scrollSource: scroller,
     timeRange: 1000,
-    startScrollOffset: '20%',
-    endScrollOffset: '80%'
+    startScrollOffset: CSS.percent(20),
+    endScrollOffset: CSS.percent(80)
   });
   const animation = new Animation(effect, timeline);
   animation.play();
diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html
index b8e678e9218..47e2717ecdc 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/scroll-animation-effect-phases.tentative.html
@@ -92,7 +92,7 @@
   function create_scroll_timeline_fill_test(delay, scroll_percentage, expected){
     return async t => {
       const target = createDiv(t);
-      const timeline = createScrollTimelineWithOffsets(t, "20%", "80%");
+      const timeline = createScrollTimelineWithOffsets(t, CSS.percent(20), CSS.percent(80));
       const effect = new KeyframeEffect(
         target,
         {
@@ -190,7 +190,7 @@
   promise_test(async t => {
     const animation = new Animation(
       createKeyframeEffectOpacity(t),
-      createScrollTimelineWithOffsets(t, "20%", "80%")
+      createScrollTimelineWithOffsets(t, CSS.percent(20), CSS.percent(80))
     );
 
     const scroller = animation.timeline.scrollSource;
@@ -218,7 +218,7 @@
   promise_test(async t => {
     const animation = new Animation(
       createKeyframeEffectOpacity(t),
-      createScrollTimelineWithOffsets(t, "20%", "80%")
+      createScrollTimelineWithOffsets(t, CSS.percent(20), CSS.percent(80))
     );
 
     const scroller = animation.timeline.scrollSource;
@@ -259,7 +259,7 @@
 promise_test(async t => {
   const animation = new Animation(
     createKeyframeEffectOpacity(t),
-    createScrollTimelineWithOffsets(t, "20%", "80%")
+    createScrollTimelineWithOffsets(t, CSS.percent(20), CSS.percent(80))
   );
   const scroller = animation.timeline.scrollSource;
   const maxScroll = scroller.scrollHeight - scroller.clientHeight;
@@ -314,4 +314,38 @@ promise_test(async t => {
   );
 }, 'Make scroller inactive, then set current time to an in range time');
 
+promise_test(async t => {
+  const animation = new Animation(
+    createKeyframeEffectOpacity(t),
+    createScrollTimelineWithOffsets(t, CSS.percent(20), CSS.percent(80))
+  );
+  const scroller = animation.timeline.scrollSource;
+  const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+  scroller.scrollTop = 0.5 * maxScroll;
+  // allow the scroll to finish.
+  await waitForNextFrame();
+
+  animation.pause();
+  await animation.ready;
+  // verify effect is applied.
+  const expected_progress = 0.5;
+  assert_equals(
+    animation.effect.getComputedTiming().progress,
+    expected_progress,
+    "Verify effect progress after pausing."
+  );
+
+  // cause the timeline to become inactive
+  scroller.style.overflow = 'visible';
+  await waitForAnimationFrames(2);
+  assert_equals(animation.timeline.currentTime, null,
+    'Sanity check the timeline is inactive.');
+  assert_equals(
+    animation.effect.getComputedTiming().progress,
+    expected_progress,
+    "Verify effect progress after the timeline goes inactive."
+  );
+}, 'Animation effect is still applied after pausing and making timeline ' +
+   'inactive.');
+
 </script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
index c58ba1dc066..6e5c752d599 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
@@ -58,7 +58,7 @@
   for (const test_case_key in test_cases){
     const test_case = test_cases[test_case_key];
     promise_test(async t => {
-      const timeline = createScrollTimelineWithOffsets(t, "20%", "80%");
+      const timeline = createScrollTimelineWithOffsets(t, CSS.percent(20), CSS.percent(80));
       const scroller = timeline.scrollSource;
       const maxScroll = scroller.scrollHeight - scroller.clientHeight;
 
@@ -111,7 +111,7 @@
     const test_case =
       test_cases_start_offset_greater_than_end_offset[test_case_key];
     promise_test(async t => {
-      const timeline = createScrollTimelineWithOffsets(t, "80%", "20%");
+      const timeline = createScrollTimelineWithOffsets(t, CSS.percent(80), CSS.percent(20));
       const scroller = timeline.scrollSource;
       const maxScroll = scroller.scrollHeight - scroller.clientHeight;
 
@@ -154,7 +154,7 @@
     const test_case =
       test_cases_start_offset_equal_to_end_offset[test_case_key];
     promise_test(async t => {
-      const timeline = createScrollTimelineWithOffsets(t, "50%", "50%");
+      const timeline = createScrollTimelineWithOffsets(t, CSS.percent(50), CSS.percent(50));
       const scroller = timeline.scrollSource;
       const maxScroll = scroller.scrollHeight - scroller.clientHeight;
 
diff --git a/tests/wpt/web-platform-tests/scroll-animations/setting-timeline.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/setting-timeline.tentative.html
new file mode 100644
index 00000000000..3fd0c0cd676
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/setting-timeline.tentative.html
@@ -0,0 +1,320 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Setting the timeline of scroll animation</title>
+<link rel="help"
+      href="https://drafts.csswg.org/web-animations-1/#setting-the-timeline">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script src="testcommon.js"></script>
+<style>
+  .scroller {
+    overflow: auto;
+    height: 200px;
+    width: 100px;
+    will-change: transform;
+  }
+  .contents {
+    /* The height is set to align scrolling in pixels with logical time in ms */
+    height: 1200px;
+    width: 100%;
+  }
+  @keyframes anim {
+    from { opacity: 0; }
+    to { opacity: 1; }
+  }
+  .anim {
+    animation: anim 1s paused linear;
+  }
+</style>
+<body>
+<script>
+'use strict';
+
+function createAnimation(t) {
+  const elem = createDiv(t);
+  const animation = elem.animate({ opacity: [1, 0] }, 1000);
+  return animation;
+}
+
+function createPausedCssAnimation(t) {
+  const elem = createDiv(t);
+  elem.classList.add('anim');
+  return elem.getAnimations()[0];
+}
+
+function updateScrollPosition(timeline, offset) {
+  const scroller = timeline.scrollSource;
+  assert_true(!!scroller, 'scrollSource is resolved');
+  scroller.scrollTop = offset;
+  // Wait for new animation frame which allows the timeline to compute new
+  // current time.
+  return waitForNextFrame();
+}
+
+function assert_timeline_current_time(animation, timeline_current_time) {
+  assert_times_equal(animation.timeline.currentTime, timeline_current_time,
+                     'Timeline\'s currentTime aligns with the scroll ' +
+                     'position even when paused');
+}
+
+function assert_scroll_synced_times(animation, timeline_current_time,
+                                    animation_current_time) {
+  assert_timeline_current_time(animation, timeline_current_time);
+  assert_times_equal(animation.currentTime, animation_current_time,
+                     'Animation\'s currentTime aligns with the scroll ' +
+                     'position');
+}
+
+function assert_paused_times(animation, timeline_current_time,
+                             animation_current_time) {
+  assert_timeline_current_time(animation, timeline_current_time);
+  assert_times_equal(animation.currentTime, animation_current_time,
+                     'Animation\'s currentTime is fixed while paused');
+}
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.timeline = scrollTimeline;
+  assert_true(animation.pending);
+  await animation.ready;
+
+  assert_equals(animation.playState, 'running');
+  assert_scroll_synced_times(animation, 100, 100);
+},  'Setting a scroll timeline on a play-pending animation synchronizes ' +
+    'currentTime of the animation with the scroll position.');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.pause();
+  animation.timeline = scrollTimeline;
+  assert_true(animation.pending);
+  await animation.ready;
+
+  assert_equals(animation.playState, 'paused');
+  assert_paused_times(animation, 100, 0);
+
+  await updateScrollPosition(animation.timeline, 200);
+
+  assert_equals(animation.playState, 'paused');
+  assert_paused_times(animation, 200, 0);
+
+  animation.play();
+  await animation.ready;
+
+  assert_scroll_synced_times(animation, 200, 200);
+}, 'Setting a scroll timeline on a pause-pending animation fixes the ' +
+   'currentTime of the animation based on the scroll position once resumed');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.reverse();
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+
+  assert_equals(animation.playState, 'running');
+  assert_scroll_synced_times(animation, 100, 900);
+},  'Setting a scroll timeline on a reversed play-pending animation ' +
+    'synchronizes the currentTime of the animation with the scroll ' +
+    'position.');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  await animation.ready;
+
+  animation.timeline = scrollTimeline;
+  assert_false(animation.pending);
+  assert_equals(animation.playState, 'running');
+  assert_scroll_synced_times(animation, 100, 100);
+},  'Setting a scroll timeline on a running animation synchronizes the ' +
+    'currentTime of the animation with the scroll position.');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.pause();
+  await animation.ready;
+
+  animation.timeline = scrollTimeline;
+  assert_false(animation.pending);
+  assert_equals(animation.playState, 'paused');
+  assert_paused_times(animation, 100, 0);
+
+  animation.play();
+  await animation.ready;
+
+  assert_scroll_synced_times(animation, 100, 100);
+}, 'Setting a scroll timeline on a paused animation fixes the currentTime of ' +
+   'the animation based on the scroll position when resumed');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.reverse();
+  animation.pause();
+  await animation.ready;
+
+  animation.timeline = scrollTimeline;
+  assert_false(animation.pending);
+  assert_equals(animation.playState, 'paused');
+  assert_paused_times(animation, 100, 1000);
+
+  animation.play();
+  await animation.ready;
+
+  assert_scroll_synced_times(animation, 100, 900);
+}, 'Setting a scroll timeline on a reversed paused animation ' +
+   'fixes the currentTime of the animation based on the scroll ' +
+   'position when resumed');
+
+promise_test(async t => {
+  const animation = createAnimation(t);
+  const scrollTimeline = createScrollTimeline(t);
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+  await updateScrollPosition(scrollTimeline, 100);
+
+  animation.timeline = document.timeline;
+  assert_times_equal(animation.currentTime, 100);
+}, 'Transitioning from a scroll timeline to a document timeline on a running ' +
+   'animation preserves currentTime');
+
+promise_test(async t => {
+  const animation = createAnimation(t);
+  const scrollTimeline = createScrollTimeline(t);
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+  await updateScrollPosition(scrollTimeline, 100);
+
+  animation.pause();
+  animation.timeline = document.timeline;
+
+  await animation.ready;
+  assert_times_equal(animation.currentTime, 100);
+}, 'Transitioning from a scroll timeline to a document timeline on a ' +
+   'pause-pending animation preserves currentTime');
+
+promise_test(async t => {
+  const animation = createAnimation(t);
+  const scrollTimeline = createScrollTimeline(t);
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+  await updateScrollPosition(scrollTimeline, 100);
+
+  assert_equals(animation.playState, 'running');
+  animation.timeline = null;
+
+  assert_equals(animation.playState, 'running');
+}, 'Transitioning from a scroll timeline to a null timeline on a running ' +
+    'animation preserves the play state');
+
+promise_test(async t => {
+  const keyframeEfect = new KeyframeEffect(createDiv(t),
+                                           { opacity: [0, 1] },
+                                           1000);
+  const animation = new Animation(keyframeEfect, null);
+  animation.startTime = 0;
+  assert_equals(animation.playState, 'running');
+
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  animation.timeline = scrollTimeline;
+  assert_equals(animation.playState, 'running');
+  assert_times_equal(animation.currentTime, 100);
+}, 'Switching from a null timeline to a scroll timeline on an animation with ' +
+   'a resolved start time preserved the play state');
+
+promise_test(async t => {
+  const firstScrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(firstScrollTimeline, 100);
+
+  const secondScrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(secondScrollTimeline, 200);
+
+  const animation = createAnimation(t);
+  animation.timeline = firstScrollTimeline;
+  await animation.ready;
+  assert_times_equal(animation.currentTime, 100);
+
+  animation.timeline = secondScrollTimeline;
+  assert_times_equal(animation.currentTime, 200);
+}, 'Switching from one scroll timeline to another updates currentTime');
+
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createPausedCssAnimation(t);
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+  assert_equals(animation.playState, 'paused');
+  assert_times_equal(animation.currentTime, 0);
+
+  const target = animation.effect.target;
+  target.style.animationPlayState = 'running';
+  await animation.ready;
+
+  assert_times_equal(animation.currentTime, 100);
+}, 'Switching from a document timeline to a scroll timeline updates ' +
+   'currentTime when unpaused via CSS.');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.pause();
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+  assert_times_equal(animation.currentTime, 0);
+
+  animation.currentTime = 500;
+
+  animation.play();
+  await animation.ready;
+  assert_times_equal(animation.currentTime, 500);
+}, 'Switching from a document timeline to a scroll timeline and updating ' +
+   'currentTime preserves the new value when unpaused.');
+
+promise_test(async t => {
+  const scrollTimeline = createScrollTimeline(t);
+  await updateScrollPosition(scrollTimeline, 100);
+
+  const animation = createAnimation(t);
+  animation.pause();
+  animation.timeline = scrollTimeline;
+  await animation.ready;
+  assert_times_equal(animation.currentTime, 0);
+  assert_equals(animation.playState, 'paused');
+
+  // Set a start time that will ensure that current time is in the active
+  // region in order not to trigger a seek when play is called.
+  animation.startTime = -100;
+  assert_equals(animation.playState, 'running');
+
+  animation.play();
+  await animation.ready;
+  assert_times_equal(animation.startTime, -100);
+}, 'Switching from a document timeline to a scroll timeline and updating ' +
+   'startTime preserves the new value when play is called.');
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/client-redirect.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/client-redirect.html
new file mode 100644
index 00000000000..73858969e02
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/client-redirect.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<script>
+  const query = window.location.search.substr(1);
+  const type = query.split('&')[0];
+  const url = decodeURIComponent(query.split('&')[1]);
+
+  if (type == 'meta') {
+    document.write(`<meta http-equiv="Refresh" content="0; URL=${url}">`);
+  } else if (type == 'location') {
+    window.location = url;
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/idlharness.window.js b/tests/wpt/web-platform-tests/scroll-to-text-fragment/idlharness.window.js
new file mode 100644
index 00000000000..c39216b5811
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/idlharness.window.js
@@ -0,0 +1,15 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+idl_test(
+  ['scroll-to-text-fragment'],
+  ['dom', 'html'],
+  idl_array => {
+    idl_array.add_objects({
+      Document: ['document'],
+      FragmentDirective: ['document.fragmentDirective'],
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target.html
new file mode 100644
index 00000000000..5e44230a958
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<title>Destination of a Redirect</title>
+<script src="stash.js"></script>
+<script>
+function checkScroll() {
+  // Two rAFs since the exact timing of when we cause scrolling is up to the
+  // UA.
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      let twice = (new URL(document.location)).searchParams.get("twice");
+      let key = (new URL(document.location)).searchParams.get("key");
+      let results = {
+        scrolled: (window.pageYOffset != 0),
+      };
+
+      if (twice != null) {
+        // If this param is specified, we'll try to redirect to another
+        // text-fragment after this one has been invoked.
+        if (!results.scrolled) {
+          results.scrolled = null;
+          stashResultsThenClose(key, results);
+          throw "Intermediate page failed to scroll to fragment";
+        }
+
+        window.location = `redirects-target2.html?key=${key}#:~:text=target`;
+      } else {
+        stashResultsThenClose(key, results);
+      }
+    });
+  });
+}
+window.addEventListener('load', checkScroll);
+</script>
+<style>
+  p#target {
+    margin: 2000px 0px 2000px 0px;
+  }
+</style>
+<body>
+  <p>Top of page</p>
+  <p id="target">target</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target2.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target2.html
new file mode 100644
index 00000000000..239c0fe1e61
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects-target2.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<title>Destination of a Redirect</title>
+<script src="stash.js"></script>
+<script>
+function checkScroll() {
+  // Two rAFs since the exact timing of when we cause scrolling is up to the
+  // UA.
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      let results = {
+        scrolled: (window.pageYOffset != 0),
+      };
+      let key = (new URL(document.location)).searchParams.get("key");
+      stashResultsThenClose(key, results);
+    });
+  });
+}
+window.addEventListener('load', checkScroll);
+</script>
+<style>
+  p#target {
+    margin: 2000px 0px 2000px 0px;
+  }
+</style>
+<body>
+  <p>Top of page</p>
+  <p id="target">target</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects.html
new file mode 100644
index 00000000000..5ad910affe5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/redirects.html
@@ -0,0 +1,126 @@
+<!doctype html>
+<title>TextFragment invoked on redirects</title>
+<meta charset=utf-8>
+<link rel="help" href="https://wicg.github.io/ScrollToTextFragment/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="stash.js"></script>
+
+<!--See comment in scroll-to-text-fragment.html for why these tests have the
+structure they do. -->
+<script>
+// This test ensure correct operation of text-fragments through both HTTP and
+// client side redirects in various scenarios.
+
+// Constructs a URL to either redirect.py or the local client-redirect.html;
+// which will cause an HTTP or client based redirect, respectively, to
+// |to_url|. |type| provides a numeric 30x code to specify an HTTP redirect,
+// "location" for a write to window.location, or "meta" for a <meta> refresh.
+function buildRedirectUrl(to_url, type) {
+  let dest = "";
+  to_url = encodeURIComponent(to_url);
+
+  if (typeof type == "number") {
+    // If the type is a number, it's an HTTP response code, use redirect.py to
+    // respond with an HTTP redirect.
+    const code = type;
+    dest = `${get_host_info().ORIGIN}/common/redirect.py?status=${code}&location=${to_url}`;
+  } else if (type == 'meta' || type == 'location') {
+    // Otherwise we're requesting a client-side redirect, either a <meta> tag
+    // or window.location. Use the client-redirect file to bounce to the
+    // destination.
+    dest = `client-redirect.html?${type}&${to_url}`;
+  }
+  return dest;
+}
+
+// Turns |path| from a relative-to-this-file path into a full URL.
+function relativePathToFull(path) {
+  const pathname = window.location.toString();
+  const base_path = pathname.substring(0, pathname.lastIndexOf('/') + 1);
+  return base_path + path;
+}
+
+const status_codes = [301, 302, 303, 307, 308];
+
+// Test that an HTTP redirect to a URL with a text fragment invokes the
+// fragment.
+for (let code of status_codes) {
+  promise_test(t => new Promise((resolve, reject) => {
+    let key = token();
+
+    const abs_url = relativePathToFull(`redirects-target.html?key=${key}#:~:text=target`);
+    const url = buildRedirectUrl(abs_url, code);
+
+    test_driver.bless('Open a URL with a text fragment directive', () => {
+      window.open(url, '_blank', 'noopener');
+    });
+
+    fetchResults(key, resolve, reject);
+  }).then(data => {
+    assert_equals(data.scrolled, true);
+  }), `Text fragment works from HTTP ${code} redirect.`);
+}
+
+// Test that a URL with a text fragment that causes an HTTP redirect preserves
+// the fragment and invokes it on the destination page.
+for (let code of status_codes) {
+  promise_test(t => new Promise((resolve, reject) => {
+    let key = token();
+
+    const abs_url = relativePathToFull(`redirects-target.html?key=${key}`);
+    const url = buildRedirectUrl(abs_url, code) + "#:~:text=target";
+
+    test_driver.bless('Open a URL with a text fragment directive', () => {
+      window.open(url, '_blank', 'noopener');
+    });
+
+    fetchResults(key, resolve, reject);
+  }).then(data => {
+    assert_equals(data.scrolled, true);
+  }), `Text fragment propagated through HTTP ${code} redirect.`);
+}
+
+// Test that client-side redirects (using script) to a URL with a text fragment
+// cause the text fragment to be invoked.
+for (let type of ['location', 'meta']) {
+  promise_test(t => new Promise((resolve, reject) => {
+    let key = token();
+
+    const to_url = `redirects-target.html?key=${key}#:~:text=target`
+    const url = buildRedirectUrl(to_url, type);
+
+    test_driver.bless('Open a URL with a text fragment directive', () => {
+      window.open(url, '_blank', 'noopener');
+    });
+
+    fetchResults(key, resolve, reject);
+  }).then(data => {
+    assert_equals(data.scrolled, true);
+  }), `Text fragment works on client-side ${type} redirect.`);
+}
+
+// Test that client-side redirects (using script) to a URL with a text fragment
+// cause the text fragment to be invoked only the first time. A further
+// redirect without a user gesture is blocked.
+for (let type of ['location', 'meta']) {
+  promise_test(t => new Promise((resolve, reject) => {
+    let key = token();
+
+    const to_url = `redirects-target.html?twice&key=${key}#:~:text=target`
+    const url = buildRedirectUrl(to_url, type);
+
+    test_driver.bless('Open a URL with a text fragment directive', () => {
+      window.open(url, '_blank', 'noopener');
+    });
+
+    fetchResults(key, resolve, reject);
+  }).then(data => {
+    assert_equals(data.scrolled, false);
+  }), `One text fragment per user gesture allowed in client-side ${type} redirect.`);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html
index 8b1dea6f331..d644b6b64fb 100644
--- a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-api.html
@@ -8,15 +8,15 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script>
 test(t => {
-  assert_equals(typeof(window.location.fragmentDirective), 'object', 'window.location.fragmentDirective is defined');
-}, 'Scroll to text is feature detectable via window.location.fragmentDirective');
+  assert_equals(typeof(document.fragmentDirective), 'object', 'document.fragmentDirective is defined');
+}, 'Scroll to text is feature detectable via document.fragmentDirective');
 
 test(t =>{
-  window.location.fragmentDirective = 'text=test';
-  assert_equals(window.scrollY, 0, 'Setting window.location.fragmentDirective did not have an effect on scroll position');
-  assert_equals(typeof(window.location.fragmentDirective), 'object', 'window.location.fragmentDirective is still an object type');
-  assert_equals(Object.keys(window.location.fragmentDirective).length, 0, 'window.location.fragmentDirective has no properties');
-}, 'Setting window.location.fragmentDirective has no effect');
+  document.fragmentDirective = 'text=test';
+  assert_equals(window.scrollY, 0, 'Setting document.fragmentDirective did not have an effect on scroll position');
+  assert_equals(typeof(document.fragmentDirective), 'object', 'document.fragmentDirective is still an object type');
+  assert_equals(Object.keys(document.fragmentDirective).length, 0, 'document.fragmentDirective has no properties');
+}, 'Setting document.fragmentDirective has no effect');
 </script>
 <style>
   body {
diff --git a/tests/wpt/web-platform-tests/secure-contexts/idlharness.any.js b/tests/wpt/web-platform-tests/secure-contexts/idlharness.any.js
deleted file mode 100644
index 396dfff1fdf..00000000000
--- a/tests/wpt/web-platform-tests/secure-contexts/idlharness.any.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// META: global=window,worker
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-// META: timeout=long
-
-// https://w3c.github.io/webappsec-secure-contexts/
-
-'use strict';
-
-idl_test(
-  ['secure-contexts'],
-  ['html', 'dom'],
-  idl_array => {
-    if (self.Window) {
-      idl_array.add_objects({ Window: ['self'] });
-    } else {
-      idl_array.add_objects({ WorkerGlobalScope: ['self'] });
-    }
-  }
-);
diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/collapse.html b/tests/wpt/web-platform-tests/selection/contenteditable/collapse.html
new file mode 100644
index 00000000000..6081d055167
--- /dev/null
+++ b/tests/wpt/web-platform-tests/selection/contenteditable/collapse.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Selection across multiple contenteditable</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<button id="button"></button>
+<div contenteditable id="host1"></div>
+<div contenteditable id="host2"></div>
+<div contenteditable id="host3">
+  <div contenteditable="false">
+    <div contenteditable id="host4"></div>
+  </div>
+</div>
+<script>
+function clearFocus() {
+  // Move focus from editable host to a button to remove selection limiter
+  button.focus();
+}
+test(() => {
+  clearFocus();
+  getSelection().collapse(host1);
+  assert_equals(document.activeElement, host1);
+  getSelection().collapse(host2);
+  assert_equals(document.activeElement, host2);
+}, "Selection.collapse() must succeed across siblings");
+
+test(() => {
+  clearFocus();
+  getSelection().collapse(host4);
+  assert_equals(document.activeElement, host4);
+  getSelection().collapse(host3);
+  assert_equals(document.activeElement, host3);
+}, "Selection.collapse() must succeed for the ancestor");
+
+
+test(() => {
+  clearFocus();
+  getSelection().collapse(host3);
+  assert_equals(document.activeElement, host3);
+  getSelection().collapse(host4);
+  assert_equals(document.activeElement, host4);
+}, "Selection.collapse() must succeed for the descendant");
+</script>
diff --git a/tests/wpt/web-platform-tests/selection/contenteditable/modify.tentative.html b/tests/wpt/web-platform-tests/selection/contenteditable/modify.tentative.html
new file mode 100644
index 00000000000..aaedc72644b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/selection/contenteditable/modify.tentative.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Selection.modify() inside contenteditable</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div contenteditable id="host">Editable</div>
+<div>Non-editable</div>
+<script>
+const selection = getSelection();
+test(() => {
+  selection.collapse(host);
+  selection.modify('extend', 'forward', 'word');
+  selection.modify('extend', 'forward', 'word');
+  assert_equals(selection.focusNode.parentElement, host);
+}, "Selection.modify() must not select outside of the host");
+</script>
diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-add.js b/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-add.js
index f1617109cfa..62b44c78801 100644
--- a/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-add.js
+++ b/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-add.js
@@ -1,8 +1,11 @@
 if (self.importScripts) {
     importScripts('/resources/testharness.js');
+    importScripts('/common/get-host-info.sub.js');
     importScripts('../resources/test-helpers.js');
 }
 
+const { REMOTE_HOST } = get_host_info();
+
 cache_test(function(cache, test) {
     return promise_rejects_js(
       test,
@@ -104,6 +107,21 @@ cache_test(function(cache, test) {
       'Cache.addAll should reject with TypeError if any request fails');
   }, 'Cache.addAll with 206 response');
 
+cache_test(function(cache, test) {
+    var urls = ['../resources/fetch-status.py?status=206',
+                '../resources/fetch-status.py?status=200'];
+    var requests = urls.map(function(url) {
+        var cross_origin_url = new URL(url, location.href);
+        cross_origin_url.hostname = REMOTE_HOST;
+        return new Request(cross_origin_url.href, { mode: 'no-cors' });
+      });
+    return promise_rejects_js(
+      test,
+      TypeError,
+      cache.addAll(requests),
+      'Cache.addAll should reject with TypeError if any request fails');
+  }, 'Cache.addAll with opaque-filtered 206 response');
+
 cache_test(function(cache, test) {
     return promise_rejects_js(
       test,
diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-put.js b/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-put.js
index 44ba565d86c..b45910a3b8b 100644
--- a/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-put.js
+++ b/tests/wpt/web-platform-tests/service-workers/cache-storage/script-tests/cache-put.js
@@ -1,10 +1,12 @@
 if (self.importScripts) {
     importScripts('/resources/testharness.js');
+    importScripts('/common/get-host-info.sub.js');
     importScripts('../resources/test-helpers.js');
 }
 
 var test_url = 'https://example.com/foo';
 var test_body = 'Hello world!';
+const { REMOTE_HOST } = get_host_info();
 
 cache_test(function(cache) {
     var request = new Request(test_url);
@@ -129,6 +131,23 @@ cache_test(function(cache, test) {
         });
   }, 'Cache.put with HTTP 206 response');
 
+cache_test(function(cache, test) {
+    var test_url = new URL('../resources/fetch-status.py?status=206', location.href);
+    test_url.hostname = REMOTE_HOST;
+    var request = new Request(test_url.href, { mode: 'no-cors' });
+    var response;
+    return fetch(request)
+      .then(function(fetch_result) {
+          assert_equals(fetch_result.type, 'opaque',
+              'Test framework error: The response type should be opaque.');
+          assert_equals(fetch_result.status, 0,
+              'Test framework error: The status code should be 0 for an ' +
+              ' opaque-filtered response. This is actually HTTP 206.');
+          response = fetch_result.clone();
+          return promise_rejects_js(test, TypeError, cache.put(request, fetch_result));
+        });
+  }, 'Cache.put with opaque-filtered HTTP 206 response');
+
 cache_test(function(cache) {
     var test_url = new URL('../resources/fetch-status.py?status=500', location.href).href;
     var request = new Request(test_url);
diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-add.https.html b/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-add.https.html
index 8dfb786cf35..b5a64c6c369 100644
--- a/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-add.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-add.https.html
@@ -4,5 +4,6 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="../resources/test-helpers.js"></script>
 <script src="../script-tests/cache-add.js"></script>
diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-put.https.html b/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-put.https.html
index 1ee14bdd124..9641c347051 100644
--- a/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-put.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/cache-storage/window/cache-put.https.html
@@ -4,6 +4,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <script src="../resources/test-helpers.js"></script>
 <script src="../script-tests/cache-put.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html
index fe227d9ce2f..50864ca7895 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html
@@ -117,7 +117,7 @@ function fetch_test(frame, url, mode, credentials,
       credentials: expected_credentials,
       redirect: 'follow',
       integrity: '',
-      destination: 'empty',
+      destination: '',
       message: `fetch (url:${actual_url} mode:${mode} ` +
                `credentials:${credentials})`
     };
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
index bbd16abce4b..38840b75303 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
@@ -92,56 +92,66 @@ function wait_for_update(test, registration) {
     }));
 }
 
-function wait_for_state(test, worker, state) {
-  if (!worker || worker.state == undefined) {
-    return Promise.reject(new Error(
-      'wait_for_state must be passed a ServiceWorker'));
-  }
-  if (worker.state === state)
-    return Promise.resolve(state);
-
-  if (state === 'installing') {
-    switch (worker.state) {
+// Return true if |state_a| is more advanced than |state_b|.
+function is_state_advanced(state_a, state_b) {
+  if (state_b === 'installing') {
+    switch (state_a) {
       case 'installed':
       case 'activating':
       case 'activated':
       case 'redundant':
-        return Promise.reject(new Error(
-          'worker is ' + worker.state + ' but waiting for ' + state));
+        return true;
     }
   }
 
-  if (state === 'installed') {
-    switch (worker.state) {
+  if (state_b === 'installed') {
+    switch (state_a) {
       case 'activating':
       case 'activated':
       case 'redundant':
-        return Promise.reject(new Error(
-          'worker is ' + worker.state + ' but waiting for ' + state));
+        return true;
     }
   }
 
-  if (state === 'activating') {
-    switch (worker.state) {
+  if (state_b === 'activating') {
+    switch (state_a) {
       case 'activated':
       case 'redundant':
-        return Promise.reject(new Error(
-          'worker is ' + worker.state + ' but waiting for ' + state));
+        return true;
     }
   }
 
-  if (state === 'activated') {
-    switch (worker.state) {
+  if (state_b === 'activated') {
+    switch (state_a) {
       case 'redundant':
-        return Promise.reject(new Error(
-          'worker is ' + worker.state + ' but waiting for ' + state));
+        return true;
     }
   }
+  return false;
+}
 
-  return new Promise(test.step_func(function(resolve) {
+function wait_for_state(test, worker, state) {
+  if (!worker || worker.state == undefined) {
+    return Promise.reject(new Error(
+      'wait_for_state needs a ServiceWorker object to be passed.'));
+  }
+  if (worker.state === state)
+    return Promise.resolve(state);
+
+  if (is_state_advanced(worker.state, state)) {
+    return Promise.reject(new Error(
+      `Waiting for ${state} but the worker is already ${worker.state}.`));
+  }
+  return new Promise(test.step_func(function(resolve, reject) {
       worker.addEventListener('statechange', test.step_func(function() {
           if (worker.state === state)
             resolve(state);
+
+          if (is_state_advanced(worker.state, state)) {
+            reject(new Error(
+              `The state of the worker becomes ${worker.state} while waiting` +
+                `for ${state}.`));
+          }
         }));
     }));
 }
diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-on-worker.https.worker.js b/tests/wpt/web-platform-tests/shape-detection/detection-on-worker.https.worker.js
index 94b8e37d727..3981c6fdc8e 100644
--- a/tests/wpt/web-platform-tests/shape-detection/detection-on-worker.https.worker.js
+++ b/tests/wpt/web-platform-tests/shape-detection/detection-on-worker.https.worker.js
@@ -1,4 +1,5 @@
 importScripts("/resources/testharness.js");
+importScripts("/resources/test-only-api.js");
 importScripts("resources/shapedetection-helpers.js");
 
 'use strict';
diff --git a/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js b/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js
index bdb0e857d78..05424de893d 100644
--- a/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js
+++ b/tests/wpt/web-platform-tests/shape-detection/resources/shapedetection-helpers.js
@@ -9,17 +9,9 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 
-let loadChromiumResources = Promise.resolve().then(() => {
-  if (!('MojoInterfaceInterceptor' in self)) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
-
+async function loadChromiumResources() {
   const prefix = '/gen/services/shape_detection/public/mojom';
-  let chain = Promise.resolve();
-  [
-    '/gen/layout_test_data/mojo/public/js/mojo_bindings.js',
+  const chromiumResources = [
     '/gen/mojo/public/mojom/base/big_buffer.mojom.js',
     '/gen/skia/public/mojom/image_info.mojom.js',
     '/gen/skia/public/mojom/bitmap.mojom.js',
@@ -29,26 +21,13 @@ let loadChromiumResources = Promise.resolve().then(() => {
     `${prefix}/facedetection.mojom.js`,
     `${prefix}/facedetection_provider.mojom.js`,
     `${prefix}/textdetection.mojom.js`,
-    '/resources/chromium/mock-barcodedetection.js',
-    '/resources/chromium/mock-facedetection.js',
-    '/resources/chromium/mock-textdetection.js',
-  ].forEach(path => {
-    // Use importScripts for workers.
-    if (typeof document === 'undefined') {
-      chain = chain.then(() => importScripts(path));
-      return;
-    }
-    let script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    chain = chain.then(() => new Promise(resolve => {
-      script.onload = () => resolve();
-    }));
-    document.head.appendChild(script);
-  });
+  ];
 
-  return chain;
-});
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/chromium/mock-barcodedetection.js');
+  await loadScript('/resources/chromium/mock-facedetection.js');
+  await loadScript('/resources/chromium/mock-textdetection.js');
+}
 
 /**
  * @param {String} detectionTestName
@@ -58,15 +37,31 @@ let loadChromiumResources = Promise.resolve().then(() => {
 */
 async function initialize_detection_tests(detectionTestName) {
   let detectionTest;
-  // Use 'self' for workers.
   if (typeof document === 'undefined') {
+    // Use 'self' for workers.
     if (typeof self[detectionTestName] === 'undefined') {
-      await loadChromiumResources;
+      // test-only-api.js is already loaded in worker.js
+      if (isChromiumBased) {
+        await loadChromiumResources();
+      }
     }
     detectionTest = new self[detectionTestName]();
   } else {
     if (typeof window[detectionTestName] === 'undefined') {
-      await loadChromiumResources;
+      const script = document.createElement('script');
+      script.src = '/resources/test-only-api.js';
+      script.async = false;
+      const p = new Promise((resolve, reject) => {
+        script.onload = () => { resolve(); };
+        script.onerror = e => { reject(e); };
+      })
+      document.head.appendChild(script);
+      await p;
+
+      if (isChromiumBased) {
+        await loadChromiumResources();
+      }
+
     }
     detectionTest = new window[detectionTestName]();
   }
diff --git a/tests/wpt/web-platform-tests/storage/quotachange-in-detached-iframe.tentative.https.html b/tests/wpt/web-platform-tests/storage/quotachange-in-detached-iframe.tentative.https.html
new file mode 100644
index 00000000000..123af50e3ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/storage/quotachange-in-detached-iframe.tentative.https.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>quotachange event on DOMWindow of detached iframe</title>
+<link rel="author" href="jarrydg@chromium.org" title="Jarryd">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="iframe"></iframe>
+<script>
+'use strict';
+
+test(t => {
+  const iframe = document.getElementById('iframe');
+  const frameWindow = iframe.contentWindow;
+  const storageManager = frameWindow.navigator.storage;
+
+  iframe.parentNode.removeChild(iframe);
+  const emptyListener = () => {};
+  storageManager.addEventListener('quotachange', emptyListener);
+  storageManager.removeEventListener('quotachange', emptyListener);
+}, "Add quotachange listener on detached iframe.");
+</script>
diff --git a/tests/wpt/web-platform-tests/streams/transferable/deserialize-error.window.js b/tests/wpt/web-platform-tests/streams/transferable/deserialize-error.window.js
new file mode 100644
index 00000000000..64cf2bbfb12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/streams/transferable/deserialize-error.window.js
@@ -0,0 +1,39 @@
+// META: script=/common/get-host-info.sub.js
+// META: script=resources/create-wasm-module.js
+// META: timeout=long
+
+const { HTTPS_NOTSAMESITE_ORIGIN } = get_host_info();
+const iframe = document.createElement('iframe');
+iframe.src = `${HTTPS_NOTSAMESITE_ORIGIN}/streams/transferable/resources/deserialize-error-frame.html`;
+
+window.addEventListener('message', async evt => {
+  // Tests are serialized to make the results deterministic.
+  switch (evt.data) {
+    case 'init done': {
+      const ws = new WritableStream();
+      iframe.contentWindow.postMessage(ws, '*', [ws]);
+      return;
+    }
+
+    case 'ws done': {
+      const module = await createWasmModule();
+      const rs = new ReadableStream({
+        start(controller) {
+          controller.enqueue(module);
+        }
+      });
+      iframe.contentWindow.postMessage(rs, '*', [rs]);
+      return;
+    }
+
+    case 'rs done': {
+      iframe.remove();
+    }
+  }
+});
+
+// Need to do this after adding the listener to ensure we catch the first
+// message.
+document.body.appendChild(iframe);
+
+fetch_tests_from_window(iframe.contentWindow);
diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/create-wasm-module.js b/tests/wpt/web-platform-tests/streams/transferable/resources/create-wasm-module.js
new file mode 100644
index 00000000000..37064af95c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/streams/transferable/resources/create-wasm-module.js
@@ -0,0 +1,11 @@
+// There aren't many cloneable types that will cause an error on
+// deserialization. WASM modules have the property that it's an error to
+// deserialize them cross-site, which works for our purposes.
+async function createWasmModule() {
+  // It doesn't matter what the module is, so we use one from another
+  // test.
+  const response =
+        await fetch("/wasm/serialization/module/resources/incrementer.wasm");
+  const ab = await response.arrayBuffer();
+  return WebAssembly.compile(ab);
+}
diff --git a/tests/wpt/web-platform-tests/streams/transferable/resources/deserialize-error-frame.html b/tests/wpt/web-platform-tests/streams/transferable/resources/deserialize-error-frame.html
new file mode 100644
index 00000000000..5ec2fcda2cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/streams/transferable/resources/deserialize-error-frame.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="create-wasm-module.js"></script>
+<script>
+async_test(t => {
+  parent.postMessage('init done', '*');
+  window.addEventListener('message', async evt => {
+    if (evt.data.constructor.name !== 'WritableStream') {
+      return;
+    }
+    const ws = evt.data;
+    const writer = ws.getWriter();
+    const module = await createWasmModule();
+    writer.write(module);
+    await promise_rejects_dom(t, 'DataCloneError', writer.closed,
+                              'should reject with a DataCloneError');
+    t.done();
+    // Signal that this test is done. When both tests are done the iframe will
+    // be removed.
+    parent.postMessage('ws done', '*');
+  });
+}, 'a WritableStream deserialization failure should result in a DataCloneError');
+
+async_test(t => {
+  window.addEventListener('message', async evt => {
+    if (evt.data.constructor.name !== 'ReadableStream') {
+      return;
+    }
+    const rs = evt.data;
+    const reader = rs.getReader();
+    await promise_rejects_dom(t, 'DataCloneError', reader.read(),
+                              'should reject with a DataCloneError');
+    t.done();
+    // Signal that this test is done. When both tests are done the iframe will
+    // be removed.
+    parent.postMessage('rs done', '*');
+  });
+}, 'a ReadableStream deserialization failure should result in a DataCloneError');
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/certs/config.json b/tests/wpt/web-platform-tests/tools/certs/config.json
index e9fbc576800..df93c6fc34f 100644
--- a/tests/wpt/web-platform-tests/tools/certs/config.json
+++ b/tests/wpt/web-platform-tests/tools/certs/config.json
@@ -9,7 +9,7 @@
     "ssl": {
         "type": "openssl",
         "openssl": {
-            "duration": 800,
+            "duration": 365,
             "force_regenerate": true,
             "base_path": "tools/certs"
         }
diff --git a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
index 9219623d55f..0268ac4b448 100644
--- a/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
+++ b/tests/wpt/web-platform-tests/tools/ci/azure/safari-technology-preview.rb
@@ -1,33 +1,33 @@
-cask 'safari-technology-preview' do
+cask "safari-technology-preview" do
   if MacOS.version <= :catalina
-    version '111,001-32177-20200728-f459b529-99a7-4707-a85c-e693ddb56eee'
-    sha256 'f95f72e8cf6a3160fad71411168c8f0eeb805ca1e7a7eec06b6e92d2a0ab6e85'
+    version "113,001-46217-20200908-26bf578a-dcb0-4f70-b930-d9131bbf5d8a"
+    sha256 "09f86d0808e067a46584e9394767040012d7bbae453bb9842cabbf593d9185d9"
   else
-    version '111,001-32479-20200728-12c458d1-e348-4ec5-9d55-9e9bad9c805e'
-    sha256 '6b199cca77be7407f40a62bc1ec576a8751b24da15613dfc0a951ac3d996f45f'
+    version "113,001-43557-20200908-b620aaf9-e006-4855-8bdf-e7e76b5950bc"
+    sha256 "3dcf197b8c2c181861d0c3f3d00fbb65940d1c1aaf11511c76c94fb153d0a7f0"
   end
 
   url "https://secure-appldnld.apple.com/STP/#{version.after_comma}/SafariTechnologyPreview.dmg"
-  appcast 'https://developer.apple.com/safari/download/'
-  name 'Safari Technology Preview'
-  homepage 'https://developer.apple.com/safari/download/'
+  appcast "https://developer.apple.com/safari/download/"
+  name "Safari Technology Preview"
+  homepage "https://developer.apple.com/safari/download/"
 
   auto_updates true
-  depends_on macos: '>= :catalina'
+  depends_on macos: ">= :catalina"
 
-  pkg 'Safari Technology Preview.pkg'
+  pkg "Safari Technology Preview.pkg"
 
-  uninstall delete: '/Applications/Safari Technology Preview.app'
+  uninstall delete: "/Applications/Safari Technology Preview.app"
 
   zap trash: [
-               '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.apple.safaritechnologypreview.sfl*',
-               '~/Library/Caches/com.apple.SafariTechnologyPreview',
-               '~/Library/Preferences/com.apple.SafariTechnologyPreview.plist',
-               '~/Library/SafariTechnologyPreview',
-               '~/Library/Saved Application State/com.apple.SafariTechnologyPreview.savedState',
-               '~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview-com.apple.Safari.UserRequests.plist',
-               '~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview-com.apple.Safari.WebFeedSubscriptions.plist',
-               '~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview.plist',
-               '~/Library/WebKit/com.apple.SafariTechnologyPreview',
-             ]
+    "~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.apple.safaritechnologypreview.sfl*",
+    "~/Library/Caches/com.apple.SafariTechnologyPreview",
+    "~/Library/Preferences/com.apple.SafariTechnologyPreview.plist",
+    "~/Library/SafariTechnologyPreview",
+    "~/Library/Saved Application State/com.apple.SafariTechnologyPreview.savedState",
+    "~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview-com.apple.Safari.UserRequests.plist",
+    "~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview-com.apple.Safari.WebFeedSubscriptions.plist",
+    "~/Library/SyncedPreferences/com.apple.SafariTechnologyPreview.plist",
+    "~/Library/WebKit/com.apple.SafariTechnologyPreview",
+  ]
 end
diff --git a/tests/wpt/web-platform-tests/tools/ci/commands.json b/tests/wpt/web-platform-tests/tools/ci/commands.json
index 929d2c09145..3fb6d222b17 100644
--- a/tests/wpt/web-platform-tests/tools/ci/commands.json
+++ b/tests/wpt/web-platform-tests/tools/ci/commands.json
@@ -13,6 +13,13 @@
     "help": "Output a hosts file to stdout",
     "virtualenv": false
   },
+  "regen-certs": {
+    "path": "regen_certs.py",
+    "script": "run",
+    "parser": "get_parser",
+    "help": "Regenerate the WPT certificates",
+    "virtualenv": false
+  },
   "tc-download": {
     "path": "tc/download.py",
     "script": "run",
diff --git a/tests/wpt/web-platform-tests/tools/ci/regen_certs.py b/tests/wpt/web-platform-tests/tools/ci/regen_certs.py
new file mode 100644
index 00000000000..a449bd8b82b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/ci/regen_certs.py
@@ -0,0 +1,99 @@
+import argparse
+import base64
+import logging
+import subprocess
+
+
+logger = logging.getLogger(__name__)
+
+
+# TODO(Issue #24180): Regenerate SXG fingerprint too.
+CHROME_SPKI_CERTS_CONTENT = """\
+# This file is automatically generated by 'wpt regen-certs'
+# DO NOT EDIT MANUALLY.
+
+# tools/certs/web-platform.test.pem
+WPT_FINGERPRINT = '{wpt_fingerprint}'
+
+# signed-exchange/resources/127.0.0.1.sxg.pem
+SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='
+
+IGNORE_CERTIFICATE_ERRORS_SPKI_LIST = [
+    WPT_FINGERPRINT,
+    SXG_WPT_FINGERPRINT
+]
+"""
+
+
+def get_parser():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--checkend-seconds", type=int, default=5184000,
+                        help="The number of seconds the certificates must be valid for")
+    parser.add_argument("--force", action="store_true",
+                        help="Regenerate certificates even if not reaching expiry")
+    return parser
+
+
+def check_cert(certificate, checkend_seconds):
+    """Checks whether an x509 certificate will expire within a set period.
+
+    Returns 0 if the certificate will not expire, non-zero otherwise."""
+    cmd = [
+        "openssl", "x509",
+        "-checkend", str(checkend_seconds),
+        "-noout",
+        "-in", certificate
+    ]
+    logger.info("Running '%s'" % " ".join(cmd))
+    return subprocess.call(cmd)
+
+
+def regen_certs():
+    """Regenerate the wpt openssl certificates, by delegating to wptserve."""
+    cmd = [
+        "python", "wpt", "serve",
+        "--config", "tools/certs/config.json",
+        "--exit-after-start",
+    ]
+    logger.info("Running '%s'" % " ".join(cmd))
+    subprocess.check_call(cmd)
+
+
+def regen_chrome_spki():
+    """Regenerate the SPKI fingerprints for Chrome's ignore-cert list.
+
+    Chrome requires us to explicitly list which certificates are ignored by its
+    security-checking, by listing a base64 hash of the public key. This will
+    change every time we replace our certificates, so we store the hashes in a
+    file and regenerate it here.
+    """
+    wpt_spki = calculate_spki("tools/certs/web-platform.test.pem")
+    with open("tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py", "w") as f:
+        f.write(CHROME_SPKI_CERTS_CONTENT.format(wpt_fingerprint=wpt_spki))
+
+
+def calculate_spki(cert_path):
+    """Calculate the SPKI fingerprint for a given x509 certificate."""
+    # We use shell=True as we control the input |cert_path|, and piping
+    # correctly across processes is non-trivial in Python.
+    cmd = ("openssl x509 -noout -pubkey -in {cert_path} | ".format(cert_path=cert_path) +
+           "openssl pkey -pubin -outform der | " +
+           "openssl dgst -sha256 -binary")
+    dgst_output = subprocess.check_output(cmd, shell=True)
+
+    return base64.b64encode(dgst_output).decode('utf-8')
+
+
+def run(**kwargs):
+    logging.basicConfig()
+
+    if kwargs["force"]:
+        logger.info("Force regenerating WPT certificates")
+    checkend_seconds = kwargs["checkend_seconds"]
+    if (kwargs["force"] or
+        check_cert("tools/certs/cacert.pem", checkend_seconds) or
+        check_cert("tools/certs/web-platform.test.pem", checkend_seconds)):
+        regen_certs()
+        regen_chrome_spki()
+    else:
+        logger.info("Certificates are still valid for at least %s seconds, skipping regeneration" % checkend_seconds)
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/github_checks_output.py b/tests/wpt/web-platform-tests/tools/ci/tc/github_checks_output.py
index 16d39900298..b34e33dd9e8 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tc/github_checks_output.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tc/github_checks_output.py
@@ -1,3 +1,10 @@
+MYPY = False
+if MYPY:
+    # MYPY is set to True when run under Mypy.
+    from typing import Any
+    from typing import Optional
+    from typing import Text
+
 class GitHubChecksOutputter(object):
     """Provides a method to output data to be shown in the GitHub Checks UI.
 
@@ -8,22 +15,28 @@ class GitHubChecksOutputter(object):
     See https://docs.taskcluster.net/docs/reference/integrations/github/checks#custom-text-output-in-checks
     """
     def __init__(self, path):
+        # type: (Text) -> None
         self.path = path
 
     def output(self, line):
+        # type: (Any) -> None
+        # TODO(stephenmcgruer): Once mypy 0.790 is released, we can change this
+        # to AnyStr, as that release teaches mypy about the mode flags of open.
+        # See https://github.com/python/typeshed/pull/4146
         with open(self.path, 'a') as f:
             f.write(line)
             f.write('\n')
 
 
 __outputter = None
-def get_gh_checks_outputter(kwargs):
+def get_gh_checks_outputter(filepath):
+    # type: (Optional[Text]) -> Optional[GitHubChecksOutputter]
     """Return the outputter for GitHub Checks output, if enabled.
 
-    :param kwargs: The arguments passed to the program (to look for the
-                   github_checks_text_file field)
+    :param filepath: The filepath to write GitHub Check output information to,
+                     or None if not enabled.
     """
     global __outputter
-    if kwargs['github_checks_text_file'] and __outputter is None:
-        __outputter = GitHubChecksOutputter(kwargs['github_checks_text_file'])
+    if filepath and __outputter is None:
+        __outputter = GitHubChecksOutputter(filepath)
     return __outputter
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml b/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml
index b1534c9d230..c3fccff0655 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml
+++ b/tests/wpt/web-platform-tests/tools/ci/tc/tasks/test.yml
@@ -13,10 +13,7 @@ components:
     extra:
       github:
         customCheckRun:
-          # We set both textArtifactName and annotationsArtifactName due
-          # to https://github.com/taskcluster/taskcluster/issues/3191
           textArtifactName: public/results/checkrun.md
-          annotationsArtifactName: public/results/checkrun.md
 
   wpt-testharness:
     chunks: 16
@@ -386,7 +383,7 @@ tasks:
         - trigger-pr
       description: >-
         Lint for wpt-specific requirements
-      command: "./wpt lint --all"
+      command: "./wpt lint --all --github-checks-text-file=/home/test/artifacts/checkrun.md"
 
   - update-built:
       use:
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index 7bec438b773..8965c1a0a12 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -17,6 +17,7 @@ from collections import defaultdict
 from . import fnmatch
 from . import rules
 from .. import localpaths
+from ..ci.tc.github_checks_output import get_gh_checks_outputter, GitHubChecksOutputter
 from ..gitignore.gitignore import PathFilter
 from ..wpt import testfiles
 from ..manifest.vcs import walk
@@ -30,6 +31,7 @@ MYPY = False
 if MYPY:
     # MYPY is set to True when run under Mypy.
     from typing import Any
+    from typing import Callable
     from typing import Dict
     from typing import IO
     from typing import Iterable
@@ -809,41 +811,61 @@ def check_file_contents(repo_root, path, f):
     return errors
 
 
-def output_errors_text(errors):
-    # type: (List[rules.Error]) -> None
-    assert logger is not None
+def output_errors_text(log, errors):
+    # type: (Callable[[Any], None], List[rules.Error]) -> None
     for error_type, description, path, line_number in errors:
         pos_string = path
         if line_number:
             pos_string += ":%s" % line_number
-        logger.error("%s: %s (%s)" % (pos_string, description, error_type))
+        log("%s: %s (%s)" % (pos_string, description, error_type))
 
 
-def output_errors_markdown(errors):
-    # type: (List[rules.Error]) -> None
+def output_errors_markdown(log, errors):
+    # type: (Callable[[Any], None], List[rules.Error]) -> None
     if not errors:
         return
-    assert logger is not None
     heading = """Got lint errors:
 
 | Error Type | Position | Message |
 |------------|----------|---------|"""
     for line in heading.split("\n"):
-        logger.error(line)
+        log(line)
     for error_type, description, path, line_number in errors:
         pos_string = path
         if line_number:
             pos_string += ":%s" % line_number
-        logger.error("%s | %s | %s |" % (error_type, pos_string, description))
+        log("%s | %s | %s |" % (error_type, pos_string, description))
 
 
-def output_errors_json(errors):
-    # type: (List[rules.Error]) -> None
+def output_errors_json(log, errors):
+    # type: (Callable[[Any], None], List[rules.Error]) -> None
     for error_type, error, path, line_number in errors:
+        # We use 'print' rather than the log function to ensure that the output
+        # is valid JSON (e.g. with no logger preamble).
         print(json.dumps({"path": path, "lineno": line_number,
                           "rule": error_type, "message": error}))
 
 
+def output_errors_github_checks(outputter, errors, first_reported):
+    # type: (GitHubChecksOutputter, List[rules.Error], bool) -> None
+    """Output errors to the GitHub Checks output markdown format.
+
+    :param outputter: the GitHub Checks outputter
+    :param errors: a list of error tuples (error type, message, path, line number)
+    :param first_reported: True if these are the first reported errors
+    """
+    if first_reported:
+        outputter.output(
+            "\nChanges in this PR contain lint errors, listed below. These "
+            "errors must either be fixed or added to the list of ignored "
+            "errors; see [the documentation]("
+            "https://web-platform-tests.org/writing-tests/lint-tool.html). "
+            "For help, please tag `@web-platform-tests/wpt-core-team` in a "
+            "comment.\n")
+        outputter.output("```")
+    output_errors_text(outputter.output, errors)
+
+
 def output_error_count(error_count):
     # type: (Dict[Text, int]) -> None
     if not error_count:
@@ -910,6 +932,8 @@ def create_parser():
                         "using fnmatch, except that path separators are normalized.")
     parser.add_argument("--all", action="store_true", help="If no paths are passed, try to lint the whole "
                         "working directory, not just files that changed")
+    parser.add_argument("--github-checks-text-file", type=ensure_text,
+                        help="Path to GitHub checks output file for Taskcluster runs")
     return parser
 
 
@@ -935,11 +959,13 @@ def main(**kwargs_str):
 
     ignore_glob = kwargs.get("ignore_glob", [])
 
-    return lint(repo_root, paths, output_format, ignore_glob)
+    github_checks_outputter = get_gh_checks_outputter(kwargs["github_checks_text_file"])
+
+    return lint(repo_root, paths, output_format, ignore_glob, github_checks_outputter)
 
 
-def lint(repo_root, paths, output_format, ignore_glob=None):
-    # type: (Text, List[Text], Text, Optional[List[Text]]) -> int
+def lint(repo_root, paths, output_format, ignore_glob=None, github_checks_outputter=None):
+    # type: (Text, List[Text], Text, Optional[List[Text]], Optional[GitHubChecksOutputter]) -> int
     error_count = defaultdict(int)  # type: Dict[Text, int]
     last = None
 
@@ -964,11 +990,16 @@ def lint(repo_root, paths, output_format, ignore_glob=None):
         """
 
         errors = filter_ignorelist_errors(ignorelist, errors)
-
         if not errors:
             return None
 
-        output_errors(errors)
+        assert logger is not None
+        output_errors(logger.error, errors)
+
+        if github_checks_outputter:
+            first_output = len(error_count) == 0
+            output_errors_github_checks(github_checks_outputter, errors, first_output)
+
         for error_type, error, path, line in errors:
             error_count[error_type] += 1
 
@@ -1002,6 +1033,10 @@ def lint(repo_root, paths, output_format, ignore_glob=None):
             assert logger is not None
             for line in (ERROR_MSG % (last[0], last[1], last[0], last[1])).split("\n"):
                 logger.info(line)
+
+    if error_count and github_checks_outputter:
+        github_checks_outputter.output("```")
+
     return sum(itervalues(error_count))
 
 
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
index 5857f02b6fa..e9925180f20 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
@@ -530,6 +530,7 @@ def test_main_with_args():
                                           [os.path.relpath(os.path.join(os.getcwd(), x), repo_root)
                                            for x in ['a', 'b', 'c']],
                                           "normal",
+                                          None,
                                           None)
     finally:
         sys.argv = orig_argv
@@ -542,7 +543,7 @@ def test_main_no_args():
         with _mock_lint('lint', return_value=True) as m:
             with _mock_lint('changed_files', return_value=['foo', 'bar']):
                 lint_mod.main(**vars(create_parser().parse_args()))
-                m.assert_called_once_with(repo_root, ['foo', 'bar'], "normal", None)
+                m.assert_called_once_with(repo_root, ['foo', 'bar'], "normal", None, None)
     finally:
         sys.argv = orig_argv
 
@@ -554,6 +555,6 @@ def test_main_all():
         with _mock_lint('lint', return_value=True) as m:
             with _mock_lint('all_filesystem_paths', return_value=['foo', 'bar']):
                 lint_mod.main(**vars(create_parser().parse_args()))
-                m.assert_called_once_with(repo_root, ['foo', 'bar'], "normal", None)
+                m.assert_called_once_with(repo_root, ['foo', 'bar'], "normal", None, None)
     finally:
         sys.argv = orig_argv
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index 74a2ebc3860..1c446153585 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -940,6 +940,7 @@ def get_parser():
     parser.add_argument("--no-h2", action="store_false", dest="h2", default=None,
                         help="Disable the HTTP/2.0 server")
     parser.add_argument("--quic-transport", action="store_true", help="Enable QUIC server for WebTransport")
+    parser.add_argument("--exit-after-start", action="store_true", help="Exit after starting servers")
     parser.set_defaults(report=False)
     parser.set_defaults(is_wave=False)
     return parser
@@ -990,7 +991,7 @@ def run(config_cls=ConfigBuilder, route_builder=None, **kwargs):
             signal.signal(signal.SIGINT, handle_signal)
 
             while (all(subproc.is_alive() for subproc in iter_procs(servers)) and
-                   not received_signal.is_set()):
+                   not received_signal.is_set() and not kwargs["exit_after_start"]):
                 for subproc in iter_procs(servers):
                     subproc.join(1)
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.gitignore b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.gitignore
new file mode 100644
index 00000000000..70f28670541
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/.gitignore
@@ -0,0 +1,4 @@
+*.pyc
+build/
+*.egg-info/
+dist/
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md
index 277cbe550c0..8684f2cc7ee 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/README.md
@@ -10,7 +10,7 @@ Run this to read the general document:
 $ pydoc mod_pywebsocket
 ```
 
-Please see [Wiki](../../wiki) for more details.
+Please see [Wiki](https://github.com/GoogleChromeLabs/pywebsocket3/wiki) for more details.
 
 # INSTALL #
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py
index e4459a19bc6..dafda059b11 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/example/echo_client.py
@@ -51,7 +51,7 @@ import base64
 import codecs
 from hashlib import sha1
 import logging
-from optparse import OptionParser
+import argparse
 import os
 import random
 import re
@@ -602,76 +602,78 @@ def main():
     if six.PY2:
         sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
 
-    parser = OptionParser()
+    parser = argparse.ArgumentParser()
     # We accept --command_line_flag style flags which is the same as Google
     # gflags in addition to common --command-line-flag style flags.
-    parser.add_option('-s',
-                      '--server-host',
-                      '--server_host',
-                      dest='server_host',
-                      type='string',
-                      default='localhost',
-                      help='server host')
-    parser.add_option('-p',
-                      '--server-port',
-                      '--server_port',
-                      dest='server_port',
-                      type='int',
-                      default=_UNDEFINED_PORT,
-                      help='server port')
-    parser.add_option('-o',
-                      '--origin',
-                      dest='origin',
-                      type='string',
-                      default=None,
-                      help='origin')
-    parser.add_option('-r',
-                      '--resource',
-                      dest='resource',
-                      type='string',
-                      default='/echo',
-                      help='resource path')
-    parser.add_option('-m',
-                      '--message',
-                      dest='message',
-                      type='string',
-                      help=('comma-separated messages to send. '
-                            '%s will force close the connection from server.' %
-                            _GOODBYE_MESSAGE))
-    parser.add_option('-q',
-                      '--quiet',
-                      dest='verbose',
-                      action='store_false',
-                      default=True,
-                      help='suppress messages')
-    parser.add_option('-t',
-                      '--tls',
-                      dest='use_tls',
-                      action='store_true',
-                      default=False,
-                      help='use TLS (wss://).')
-    parser.add_option('-k',
-                      '--socket-timeout',
-                      '--socket_timeout',
-                      dest='socket_timeout',
-                      type='int',
-                      default=_TIMEOUT_SEC,
-                      help='Timeout(sec) for sockets')
-    parser.add_option('--use-permessage-deflate',
-                      '--use_permessage_deflate',
-                      dest='use_permessage_deflate',
-                      action='store_true',
-                      default=False,
-                      help='Use the permessage-deflate extension.')
-    parser.add_option('--log-level',
-                      '--log_level',
-                      type='choice',
-                      dest='log_level',
-                      default='warn',
-                      choices=['debug', 'info', 'warn', 'error', 'critical'],
-                      help='Log level.')
+    parser.add_argument('-s',
+                        '--server-host',
+                        '--server_host',
+                        dest='server_host',
+                        type=six.text_type,
+                        default='localhost',
+                        help='server host')
+    parser.add_argument('-p',
+                        '--server-port',
+                        '--server_port',
+                        dest='server_port',
+                        type=int,
+                        default=_UNDEFINED_PORT,
+                        help='server port')
+    parser.add_argument('-o',
+                        '--origin',
+                        dest='origin',
+                        type=six.text_type,
+                        default=None,
+                        help='origin')
+    parser.add_argument('-r',
+                        '--resource',
+                        dest='resource',
+                        type=six.text_type,
+                        default='/echo',
+                        help='resource path')
+    parser.add_argument(
+        '-m',
+        '--message',
+        dest='message',
+        type=six.text_type,
+        default=u'Hello,\u65e5\u672c',
+        help=('comma-separated messages to send. '
+              '%s will force close the connection from server.' %
+              _GOODBYE_MESSAGE))
+    parser.add_argument('-q',
+                        '--quiet',
+                        dest='verbose',
+                        action='store_false',
+                        default=True,
+                        help='suppress messages')
+    parser.add_argument('-t',
+                        '--tls',
+                        dest='use_tls',
+                        action='store_true',
+                        default=False,
+                        help='use TLS (wss://).')
+    parser.add_argument('-k',
+                        '--socket-timeout',
+                        '--socket_timeout',
+                        dest='socket_timeout',
+                        type=int,
+                        default=_TIMEOUT_SEC,
+                        help='Timeout(sec) for sockets')
+    parser.add_argument('--use-permessage-deflate',
+                        '--use_permessage_deflate',
+                        dest='use_permessage_deflate',
+                        action='store_true',
+                        default=False,
+                        help='Use the permessage-deflate extension.')
+    parser.add_argument('--log-level',
+                        '--log_level',
+                        type=six.text_type,
+                        dest='log_level',
+                        default='warn',
+                        choices=['debug', 'info', 'warn', 'error', 'critical'],
+                        help='Log level.')
 
-    (options, unused_args) = parser.parse_args()
+    options = parser.parse_args()
 
     logging.basicConfig(level=logging.getLevelName(options.log_level.upper()))
 
@@ -682,11 +684,6 @@ def main():
         else:
             options.server_port = common.DEFAULT_WEB_SOCKET_PORT
 
-    # optparse doesn't seem to handle non-ascii default values.
-    # Set default message here.
-    if not options.message:
-        options.message = u'Hello,\u65e5\u672c'  # "Japan" in Japanese
-
     EchoClient(options).run()
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py
index 344539f6fce..314a949d455 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/extensions.py
@@ -273,6 +273,7 @@ class PerMessageDeflateExtensionProcessor(ExtensionProcessorInterface):
 
         If this method has been called with True and an offer without the
         client_max_window_bits extension parameter is received,
+
         - (When processing the permessage-deflate extension) this processor
           declines the request.
         - (When processing the permessage-compress extension) this processor
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py
index ded90b247b8..21fde59af10 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/http_header_util.py
@@ -120,7 +120,7 @@ def consume_lws(state):
 
 
 def consume_lwses(state):
-    """Consumes *LWS from the head."""
+    r"""Consumes \*LWS from the head."""
 
     while consume_lws(state):
         pass
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py
index e038d9f43ac..5e9c875dc7d 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/request_handler.py
@@ -208,7 +208,7 @@ class WebSocketRequestHandler(CGIHTTPServer.CGIHTTPRequestHandler):
             return False
 
         if self._options.use_basic_auth:
-            auth = self.headers.getheader('Authorization')
+            auth = self.headers.get('Authorization')
             if auth != self._options.basic_auth_credential:
                 self.send_response(401)
                 self.send_header('WWW-Authenticate',
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py
index 1042c496c58..b075d989f05 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/mod_pywebsocket/standalone.py
@@ -157,8 +157,9 @@ from __future__ import absolute_import
 from six.moves import configparser
 import base64
 import logging
-import optparse
+import argparse
 import os
+import six
 import sys
 import traceback
 
@@ -174,188 +175,192 @@ _DEFAULT_REQUEST_QUEUE_SIZE = 128
 
 
 def _build_option_parser():
-    parser = optparse.OptionParser()
+    parser = argparse.ArgumentParser()
 
-    parser.add_option('--config',
-                      dest='config_file',
-                      type='string',
-                      default=None,
-                      help=('Path to configuration file. See the file comment '
-                            'at the top of this file for the configuration '
-                            'file format'))
-    parser.add_option('-H',
-                      '--server-host',
-                      '--server_host',
-                      dest='server_host',
-                      default='',
-                      help='server hostname to listen to')
-    parser.add_option('-V',
-                      '--validation-host',
-                      '--validation_host',
-                      dest='validation_host',
-                      default=None,
-                      help='server hostname to validate in absolute path.')
-    parser.add_option('-p',
-                      '--port',
-                      dest='port',
-                      type='int',
-                      default=common.DEFAULT_WEB_SOCKET_PORT,
-                      help='port to listen to')
-    parser.add_option('-P',
-                      '--validation-port',
-                      '--validation_port',
-                      dest='validation_port',
-                      type='int',
-                      default=None,
-                      help='server port to validate in absolute path.')
-    parser.add_option('-w',
-                      '--websock-handlers',
-                      '--websock_handlers',
-                      dest='websock_handlers',
-                      default='.',
-                      help=('The root directory of WebSocket handler files. '
-                            'If the path is relative, --document-root is used '
-                            'as the base.'))
-    parser.add_option('-m',
-                      '--websock-handlers-map-file',
-                      '--websock_handlers_map_file',
-                      dest='websock_handlers_map_file',
-                      default=None,
-                      help=('WebSocket handlers map file. '
-                            'Each line consists of alias_resource_path and '
-                            'existing_resource_path, separated by spaces.'))
-    parser.add_option('-s',
-                      '--scan-dir',
-                      '--scan_dir',
-                      dest='scan_dir',
-                      default=None,
-                      help=('Must be a directory under --websock-handlers. '
-                            'Only handlers under this directory are scanned '
-                            'and registered to the server. '
-                            'Useful for saving scan time when the handler '
-                            'root directory contains lots of files that are '
-                            'not handler file or are handler files but you '
-                            'don\'t want them to be registered. '))
-    parser.add_option('--allow-handlers-outside-root-dir',
-                      '--allow_handlers_outside_root_dir',
-                      dest='allow_handlers_outside_root_dir',
-                      action='store_true',
-                      default=False,
-                      help=('Scans WebSocket handlers even if their canonical '
-                            'path is not under --websock-handlers.'))
-    parser.add_option('-d',
-                      '--document-root',
-                      '--document_root',
-                      dest='document_root',
-                      default='.',
-                      help='Document root directory.')
-    parser.add_option('-x',
-                      '--cgi-paths',
-                      '--cgi_paths',
-                      dest='cgi_paths',
-                      default=None,
-                      help=('CGI paths relative to document_root.'
-                            'Comma-separated. (e.g -x /cgi,/htbin) '
-                            'Files under document_root/cgi_path are handled '
-                            'as CGI programs. Must be executable.'))
-    parser.add_option('-t',
-                      '--tls',
-                      dest='use_tls',
-                      action='store_true',
-                      default=False,
-                      help='use TLS (wss://)')
-    parser.add_option('-k',
-                      '--private-key',
-                      '--private_key',
-                      dest='private_key',
-                      default='',
-                      help='TLS private key file.')
-    parser.add_option('-c',
-                      '--certificate',
-                      dest='certificate',
-                      default='',
-                      help='TLS certificate file.')
-    parser.add_option('--tls-client-auth',
-                      dest='tls_client_auth',
-                      action='store_true',
-                      default=False,
-                      help='Requests TLS client auth on every connection.')
-    parser.add_option('--tls-client-cert-optional',
-                      dest='tls_client_cert_optional',
-                      action='store_true',
-                      default=False,
-                      help=('Makes client certificate optional even though '
-                            'TLS client auth is enabled.'))
-    parser.add_option('--tls-client-ca',
-                      dest='tls_client_ca',
-                      default='',
-                      help=('Specifies a pem file which contains a set of '
-                            'concatenated CA certificates which are used to '
-                            'validate certificates passed from clients'))
-    parser.add_option('--basic-auth',
-                      dest='use_basic_auth',
-                      action='store_true',
-                      default=False,
-                      help='Requires Basic authentication.')
-    parser.add_option('--basic-auth-credential',
-                      dest='basic_auth_credential',
-                      default='test:test',
-                      help='Specifies the credential of basic authentication '
-                      'by username:password pair (e.g. test:test).')
-    parser.add_option('-l',
-                      '--log-file',
-                      '--log_file',
-                      dest='log_file',
-                      default='',
-                      help='Log file.')
+    parser.add_argument(
+        '--config',
+        dest='config_file',
+        type=six.text_type,
+        default=None,
+        help=('Path to configuration file. See the file comment '
+              'at the top of this file for the configuration '
+              'file format'))
+    parser.add_argument('-H',
+                        '--server-host',
+                        '--server_host',
+                        dest='server_host',
+                        default='',
+                        help='server hostname to listen to')
+    parser.add_argument('-V',
+                        '--validation-host',
+                        '--validation_host',
+                        dest='validation_host',
+                        default=None,
+                        help='server hostname to validate in absolute path.')
+    parser.add_argument('-p',
+                        '--port',
+                        dest='port',
+                        type=int,
+                        default=common.DEFAULT_WEB_SOCKET_PORT,
+                        help='port to listen to')
+    parser.add_argument('-P',
+                        '--validation-port',
+                        '--validation_port',
+                        dest='validation_port',
+                        type=int,
+                        default=None,
+                        help='server port to validate in absolute path.')
+    parser.add_argument(
+        '-w',
+        '--websock-handlers',
+        '--websock_handlers',
+        dest='websock_handlers',
+        default='.',
+        help=('The root directory of WebSocket handler files. '
+              'If the path is relative, --document-root is used '
+              'as the base.'))
+    parser.add_argument('-m',
+                        '--websock-handlers-map-file',
+                        '--websock_handlers_map_file',
+                        dest='websock_handlers_map_file',
+                        default=None,
+                        help=('WebSocket handlers map file. '
+                              'Each line consists of alias_resource_path and '
+                              'existing_resource_path, separated by spaces.'))
+    parser.add_argument('-s',
+                        '--scan-dir',
+                        '--scan_dir',
+                        dest='scan_dir',
+                        default=None,
+                        help=('Must be a directory under --websock-handlers. '
+                              'Only handlers under this directory are scanned '
+                              'and registered to the server. '
+                              'Useful for saving scan time when the handler '
+                              'root directory contains lots of files that are '
+                              'not handler file or are handler files but you '
+                              'don\'t want them to be registered. '))
+    parser.add_argument(
+        '--allow-handlers-outside-root-dir',
+        '--allow_handlers_outside_root_dir',
+        dest='allow_handlers_outside_root_dir',
+        action='store_true',
+        default=False,
+        help=('Scans WebSocket handlers even if their canonical '
+              'path is not under --websock-handlers.'))
+    parser.add_argument('-d',
+                        '--document-root',
+                        '--document_root',
+                        dest='document_root',
+                        default='.',
+                        help='Document root directory.')
+    parser.add_argument('-x',
+                        '--cgi-paths',
+                        '--cgi_paths',
+                        dest='cgi_paths',
+                        default=None,
+                        help=('CGI paths relative to document_root.'
+                              'Comma-separated. (e.g -x /cgi,/htbin) '
+                              'Files under document_root/cgi_path are handled '
+                              'as CGI programs. Must be executable.'))
+    parser.add_argument('-t',
+                        '--tls',
+                        dest='use_tls',
+                        action='store_true',
+                        default=False,
+                        help='use TLS (wss://)')
+    parser.add_argument('-k',
+                        '--private-key',
+                        '--private_key',
+                        dest='private_key',
+                        default='',
+                        help='TLS private key file.')
+    parser.add_argument('-c',
+                        '--certificate',
+                        dest='certificate',
+                        default='',
+                        help='TLS certificate file.')
+    parser.add_argument('--tls-client-auth',
+                        dest='tls_client_auth',
+                        action='store_true',
+                        default=False,
+                        help='Requests TLS client auth on every connection.')
+    parser.add_argument('--tls-client-cert-optional',
+                        dest='tls_client_cert_optional',
+                        action='store_true',
+                        default=False,
+                        help=('Makes client certificate optional even though '
+                              'TLS client auth is enabled.'))
+    parser.add_argument('--tls-client-ca',
+                        dest='tls_client_ca',
+                        default='',
+                        help=('Specifies a pem file which contains a set of '
+                              'concatenated CA certificates which are used to '
+                              'validate certificates passed from clients'))
+    parser.add_argument('--basic-auth',
+                        dest='use_basic_auth',
+                        action='store_true',
+                        default=False,
+                        help='Requires Basic authentication.')
+    parser.add_argument(
+        '--basic-auth-credential',
+        dest='basic_auth_credential',
+        default='test:test',
+        help='Specifies the credential of basic authentication '
+        'by username:password pair (e.g. test:test).')
+    parser.add_argument('-l',
+                        '--log-file',
+                        '--log_file',
+                        dest='log_file',
+                        default='',
+                        help='Log file.')
     # Custom log level:
     # - FINE: Prints status of each frame processing step
-    parser.add_option('--log-level',
-                      '--log_level',
-                      type='choice',
-                      dest='log_level',
-                      default='warn',
-                      choices=[
-                          'fine', 'debug', 'info', 'warning', 'warn', 'error',
-                          'critical'
-                      ],
-                      help='Log level.')
-    parser.add_option(
+    parser.add_argument('--log-level',
+                        '--log_level',
+                        type=six.text_type,
+                        dest='log_level',
+                        default='warn',
+                        choices=[
+                            'fine', 'debug', 'info', 'warning', 'warn',
+                            'error', 'critical'
+                        ],
+                        help='Log level.')
+    parser.add_argument(
         '--deflate-log-level',
         '--deflate_log_level',
-        type='choice',
+        type=six.text_type,
         dest='deflate_log_level',
         default='warn',
         choices=['debug', 'info', 'warning', 'warn', 'error', 'critical'],
         help='Log level for _Deflater and _Inflater.')
-    parser.add_option('--thread-monitor-interval-in-sec',
-                      '--thread_monitor_interval_in_sec',
-                      dest='thread_monitor_interval_in_sec',
-                      type='int',
-                      default=-1,
-                      help=('If positive integer is specified, run a thread '
-                            'monitor to show the status of server threads '
-                            'periodically in the specified inteval in '
-                            'second. If non-positive integer is specified, '
-                            'disable the thread monitor.'))
-    parser.add_option('--log-max',
-                      '--log_max',
-                      dest='log_max',
-                      type='int',
-                      default=_DEFAULT_LOG_MAX_BYTES,
-                      help='Log maximum bytes')
-    parser.add_option('--log-count',
-                      '--log_count',
-                      dest='log_count',
-                      type='int',
-                      default=_DEFAULT_LOG_BACKUP_COUNT,
-                      help='Log backup count')
-    parser.add_option('-q',
-                      '--queue',
-                      dest='request_queue_size',
-                      type='int',
-                      default=_DEFAULT_REQUEST_QUEUE_SIZE,
-                      help='request queue size')
+    parser.add_argument('--thread-monitor-interval-in-sec',
+                        '--thread_monitor_interval_in_sec',
+                        dest='thread_monitor_interval_in_sec',
+                        type=int,
+                        default=-1,
+                        help=('If positive integer is specified, run a thread '
+                              'monitor to show the status of server threads '
+                              'periodically in the specified inteval in '
+                              'second. If non-positive integer is specified, '
+                              'disable the thread monitor.'))
+    parser.add_argument('--log-max',
+                        '--log_max',
+                        dest='log_max',
+                        type=int,
+                        default=_DEFAULT_LOG_MAX_BYTES,
+                        help='Log maximum bytes')
+    parser.add_argument('--log-count',
+                        '--log_count',
+                        dest='log_count',
+                        type=int,
+                        default=_DEFAULT_LOG_BACKUP_COUNT,
+                        help='Log backup count')
+    parser.add_argument('-q',
+                        '--queue',
+                        dest='request_queue_size',
+                        type=int,
+                        default=_DEFAULT_REQUEST_QUEUE_SIZE,
+                        help='request queue size')
 
     return parser
 
@@ -364,7 +369,7 @@ def _parse_args_and_config(args):
     parser = _build_option_parser()
 
     # First, parse options without configuration file.
-    temporary_options, temporary_args = parser.parse_args(args=args)
+    temporary_options, temporary_args = parser.parse_known_args(args=args)
     if temporary_args:
         logging.critical('Unrecognized positional arguments: %r',
                          temporary_args)
@@ -390,7 +395,7 @@ def _parse_args_and_config(args):
             args = args_from_config
         else:
             args = args_from_config + args
-        return parser.parse_args(args=args)
+        return parser.parse_known_args(args=args)
     else:
         return temporary_options, temporary_args
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py
index 450a6acd537..f9aa8119e34 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/client_for_testing.py
@@ -316,6 +316,11 @@ class WebSocketHandshake(object):
 
         fields.append(u'Sec-WebSocket-Version: %d\r\n' % self._options.version)
 
+        if self._options.use_basic_auth:
+            credential = 'Basic ' + base64.b64encode(
+                self._options.basic_auth_credential.encode('UTF-8')).decode()
+            fields.append(u'Authorization: %s\r\n' % credential)
+
         # Setting up extensions.
         if len(self._options.extensions) > 0:
             fields.append(u'Sec-WebSocket-Extensions: %s\r\n' %
@@ -609,6 +614,8 @@ class ClientOptions(object):
         self.server_port = -1
         self.socket_timeout = 1000
         self.use_tls = False
+        self.use_basic_auth = False
+        self.basic_auth_credential = 'test:test'
         self.extensions = []
 
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py
index f622015539e..ea52223cea6 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/run_all.py
@@ -43,9 +43,10 @@ example, run this for making the test runner verbose.
 
 from __future__ import absolute_import
 import logging
-import optparse
+import argparse
 import os
 import re
+import six
 import sys
 import unittest
 
@@ -64,19 +65,19 @@ def _list_test_modules(directory):
 def _suite():
     loader = unittest.TestLoader()
     return loader.loadTestsFromNames(
-        _list_test_modules(os.path.join(os.path.split(__file__)[0], '.')))
+        _list_test_modules(os.path.dirname(__file__)))
 
 
 if __name__ == '__main__':
-    parser = optparse.OptionParser()
-    parser.add_option(
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
         '--log-level',
         '--log_level',
-        type='choice',
+        type=six.text_type,
         dest='log_level',
         default='warning',
         choices=['debug', 'info', 'warning', 'warn', 'error', 'critical'])
-    options, args = parser.parse_args()
+    options, args = parser.parse_known_args()
     logging.basicConfig(level=logging.getLevelName(options.log_level.upper()),
                         format='%(levelname)s %(asctime)s '
                         '%(filename)s:%(lineno)d] '
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py
index 9fce7b34b67..48d0e116a58 100644
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/set_sys_path.py
@@ -36,6 +36,6 @@ import os
 import sys
 
 # Add the parent directory to sys.path to enable importing mod_pywebsocket.
-sys.path.insert(0, os.path.join(os.path.split(__file__)[0], '..'))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
 # vi:sts=4 sw=4 et
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py
index ae63980f258..132dd92d76c 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_dispatch.py
@@ -41,8 +41,8 @@ from mod_pywebsocket import handshake
 from test import mock
 from six.moves import zip
 
-_TEST_HANDLERS_DIR = os.path.join(
-    os.path.split(__file__)[0], 'testdata', 'handlers')
+_TEST_HANDLERS_DIR = os.path.join(os.path.dirname(__file__), 'testdata',
+                                  'handlers')
 
 _TEST_HANDLERS_SUB_DIR = os.path.join(_TEST_HANDLERS_DIR, 'sub')
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py
index 445d29c67dd..8d457ff6859 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_endtoend.py
@@ -113,6 +113,18 @@ def _unmasked_frame_check_procedure(client):
     client.assert_connection_closed()
 
 
+def _check_handshake_with_basic_auth(client):
+    client.connect()
+
+    client.send_message(_GOODBYE_MESSAGE)
+    client.assert_receive(_GOODBYE_MESSAGE)
+
+    client.assert_receive_close()
+    client.send_close()
+
+    client.assert_connection_closed()
+
+
 class EndToEndTestBase(unittest.TestCase):
     """Base class for end-to-end tests that launch pywebsocket standalone
     server as a separate process, connect to it using the client_for_testing
@@ -121,7 +133,7 @@ class EndToEndTestBase(unittest.TestCase):
     """
     def setUp(self):
         self.server_stderr = None
-        self.top_dir = os.path.join(os.path.split(__file__)[0], '..')
+        self.top_dir = os.path.join(os.path.dirname(__file__), '..')
         os.putenv('PYTHONPATH', os.path.pathsep.join(sys.path))
         self.standalone_command = os.path.join(self.top_dir, 'mod_pywebsocket',
                                                'standalone.py')
@@ -146,7 +158,7 @@ class EndToEndTestBase(unittest.TestCase):
                                 stdout=stdout,
                                 stderr=stderr)
 
-    def _run_server(self):
+    def _run_server(self, extra_args=[]):
         args = [
             self.standalone_command, '-H', 'localhost', '-V', 'localhost',
             '-p',
@@ -161,6 +173,8 @@ class EndToEndTestBase(unittest.TestCase):
             args.append('--log-level')
             args.append(logging.getLevelName(log_level).lower())
 
+        args += extra_args
+
         return self._run_python_command(args, stderr=self.server_stderr)
 
     def _close_server(self, server):
@@ -187,8 +201,11 @@ class EndToEndHyBiTest(EndToEndTestBase):
     def setUp(self):
         EndToEndTestBase.setUp(self)
 
-    def _run_test_with_client_options(self, test_function, options):
-        server = self._run_server()
+    def _run_test_with_options(self,
+                               test_function,
+                               options,
+                               server_options=[]):
+        server = self._run_server(server_options)
         try:
             # TODO(tyoshino): add some logic to poll the server until it
             # becomes ready
@@ -203,7 +220,7 @@ class EndToEndHyBiTest(EndToEndTestBase):
             self._close_server(server)
 
     def _run_test(self, test_function):
-        self._run_test_with_client_options(test_function, self._options)
+        self._run_test_with_options(test_function, self._options)
 
     def _run_permessage_deflate_test(self, offer, response_checker,
                                      test_function):
@@ -227,8 +244,11 @@ class EndToEndHyBiTest(EndToEndTestBase):
         finally:
             self._close_server(server)
 
-    def _run_close_with_code_and_reason_test(self, test_function, code,
-                                             reason):
+    def _run_close_with_code_and_reason_test(self,
+                                             test_function,
+                                             code,
+                                             reason,
+                                             server_options=[]):
         server = self._run_server()
         try:
             time.sleep(_SERVER_WARMUP_IN_SEC)
@@ -528,16 +548,21 @@ class EndToEndHyBiTest(EndToEndTestBase):
 
         self._run_test(test_function)
 
-    # TODO(toyoshim): Add tests to verify invalid absolute uri handling like
-    # host unmatch, port unmatch and invalid port description (':' without port
-    # number).
-
     def test_absolute_uri(self):
         """Tests absolute uri request."""
 
         options = self._options
         options.resource = 'ws://localhost:%d/echo' % options.server_port
-        self._run_test_with_client_options(_echo_check_procedure, options)
+        self._run_test_with_options(_echo_check_procedure, options)
+
+    def test_invalid_absolute_uri(self):
+        """Tests invalid absolute uri request."""
+
+        options = self._options
+        options.resource = 'ws://invalidlocalhost:%d/echo' % options.server_port
+        options.server_stderr = subprocess.PIPE
+
+        self._run_http_fallback_test(options, 404)
 
     def test_origin_check(self):
         """Tests http fallback on origin check fail."""
@@ -549,6 +574,24 @@ class EndToEndHyBiTest(EndToEndTestBase):
         self.server_stderr = subprocess.PIPE
         self._run_http_fallback_test(options, 403)
 
+    def test_invalid_resource(self):
+        """Tests invalid resource path."""
+
+        options = self._options
+        options.resource = '/no_resource'
+
+        self.server_stderr = subprocess.PIPE
+        self._run_http_fallback_test(options, 404)
+
+    def test_fragmentized_resource(self):
+        """Tests resource name with fragment"""
+
+        options = self._options
+        options.resource = '/echo#fragment'
+
+        self.server_stderr = subprocess.PIPE
+        self._run_http_fallback_test(options, 400)
+
     def test_version_check(self):
         """Tests http fallback on version check fail."""
 
@@ -556,6 +599,32 @@ class EndToEndHyBiTest(EndToEndTestBase):
         options.version = 99
         self._run_http_fallback_test(options, 400)
 
+    def test_basic_auth_connection(self):
+        """Test successful basic auth"""
+
+        options = self._options
+        options.use_basic_auth = True
+
+        self.server_stderr = subprocess.PIPE
+        self._run_test_with_options(_check_handshake_with_basic_auth,
+                                    options,
+                                    server_options=['--basic-auth'])
+
+    def test_invalid_basic_auth_connection(self):
+        """Tests basic auth with invalid credentials"""
+
+        options = self._options
+        options.use_basic_auth = True
+        options.basic_auth_credential = 'invalid:test'
+
+        self.server_stderr = subprocess.PIPE
+
+        with self.assertRaises(client_for_testing.HttpStatusException) as e:
+            self._run_test_with_options(_check_handshake_with_basic_auth,
+                                        options,
+                                        server_options=['--basic-auth'])
+            self.assertEqual(101, e.exception.status)
+
 
 class EndToEndTestWithEchoClient(EndToEndTestBase):
     def setUp(self):
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py
index 943f21b8d29..1122c281b78 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_msgutil.py
@@ -552,7 +552,6 @@ class PerMessageDeflateTest(unittest.TestCase):
         compressed_empty = compressed_empty[:-4]
         expected += b'\x80%c' % len(compressed_empty)
         expected += compressed_empty
-        print('%r' % expected)
         self.assertEqual(expected, request.connection.written_data())
 
     def test_send_message_fragmented_empty_last_frame(self):
@@ -732,7 +731,6 @@ class PerMessageDeflateTest(unittest.TestCase):
 
             frame_count += 1
 
-        print("Chunk sizes: %r" % chunk_sizes)
         self.assertTrue(len(chunk_sizes) > 10)
 
         # Close frame
@@ -834,9 +832,7 @@ class PerMessageDeflateTest(unittest.TestCase):
                     compress = None
                     finish_used = True
 
-        print("Chunk sizes: %r" % chunk_sizes)
         self.assertTrue(len(chunk_sizes) > 10)
-        print("Methods: %r" % methods)
         self.assertTrue(sync_used)
         self.assertTrue(finish_used)
 
diff --git a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py
index 20347941051..bf4bd32bbac 100755
--- a/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py
+++ b/tests/wpt/web-platform-tests/tools/third_party/pywebsocket3/test/test_util.py
@@ -45,7 +45,7 @@ from six.moves import range
 from six import PY3
 from six import int2byte
 
-_TEST_DATA_DIR = os.path.join(os.path.split(__file__)[0], 'testdata')
+_TEST_DATA_DIR = os.path.join(os.path.dirname(__file__), 'testdata')
 
 
 class UtilTest(unittest.TestCase):
@@ -167,7 +167,6 @@ class InflaterDeflaterTest(unittest.TestCase):
             [int2byte(random.randint(0, 255)) for i in range(100 * 1024)])
 
         chunked_input = get_random_section(source, 10)
-        print("Input chunk sizes: %r" % [len(c) for c in chunked_input])
 
         deflater = util._Deflater(15)
         compressed = []
@@ -176,8 +175,6 @@ class InflaterDeflaterTest(unittest.TestCase):
         compressed.append(deflater.compress_and_finish(b''))
 
         chunked_expectation = get_random_section(source, 10)
-        print("Expectation chunk sizes: %r" %
-              [len(c) for c in chunked_expectation])
 
         inflater = util._Inflater(15)
         inflater.append(b''.join(compressed))
diff --git a/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css b/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css
index e793432ae31..150bbfd34a3 100644
--- a/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css
+++ b/tests/wpt/web-platform-tests/tools/wave/www/css/bulma-0.7.5/bulma.css
@@ -26,7 +26,7 @@
 .pagination-ellipsis, .tabs {
   -webkit-touch-callout: none;
   -webkit-user-select: none;
-  -moz-user-select: none;
+  user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index fe5189ec0b3..0f79483826b 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -427,6 +427,8 @@ class Session(object):
         if self.session_id is not None:
             return
 
+        self.transport.close()
+
         body = {"capabilities": {}}
 
         if self.requested_capabilities is not None:
@@ -452,6 +454,7 @@ class Session(object):
             pass
         finally:
             self.session_id = None
+            self.transport.close()
 
     def send_command(self, method, url, body=None, timeout=None):
         """
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 6c1c445de23..664d984da04 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -649,7 +649,10 @@ class Chrome(Browser):
             # All other channels share the same path on macOS.
             return "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
         if uname[0] == "Windows":
-            return os.path.expandvars(r"$SYSTEMDRIVE\Program Files (x86)\Google\Chrome\Application\chrome.exe")
+            path = os.path.expandvars(r"$SYSTEMDRIVE\Program Files (x86)\Google\Chrome\Application\chrome.exe")
+            if not os.path.exists(path):
+                path = os.path.expandvars(r"$SYSTEMDRIVE\Program Files\Google\Chrome\Application\chrome.exe")
+            return path
         self.logger.warning("Unable to find the browser binary.")
         return None
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py
index 327231eb7be..880e2bd43eb 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome.py
@@ -1,3 +1,4 @@
+from . import chrome_spki_certs
 from .base import Browser, ExecutorBrowser, require_arg
 from .base import get_timeout_multiplier   # noqa: F401
 from ..webdriver_server import ChromeDriverServer
@@ -23,7 +24,6 @@ __wptrunner__ = {"product": "chrome",
                  "env_options": "env_options",
                  "timeout_multiplier": "get_timeout_multiplier",}
 
-
 def check_args(**kwargs):
     require_arg(kwargs, "webdriver_binary")
 
@@ -67,7 +67,12 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
     # Here we set a few Chrome flags that are always passed.
     # ChromeDriver's "acceptInsecureCerts" capability only controls the current
     # browsing context, whereas the CLI flag works for workers, too.
-    chrome_options["args"] = ["--ignore-certificate-errors"]
+    chrome_options["args"] = []
+
+    chrome_options["args"].append("--ignore-certificate-errors")
+    chrome_options["args"].append("--ignore-certificate-errors-spki-list=%s" %
+                                  ','.join(chrome_spki_certs.IGNORE_CERTIFICATE_ERRORS_SPKI_LIST))
+
     # Allow audio autoplay without a user gesture.
     chrome_options["args"].append("--autoplay-policy=no-user-gesture-required")
     # Allow WebRTC tests to call getUserMedia.
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
new file mode 100644
index 00000000000..e8971e7acde
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
@@ -0,0 +1,13 @@
+# This file is automatically generated by 'wpt regen-certs'
+# DO NOT EDIT MANUALLY.
+
+# tools/certs/web-platform.test.pem
+WPT_FINGERPRINT = 'VPzsk0tdACJMqhsnPpMDesIkQYZrI2RGR+UlPK4emE4='
+
+# signed-exchange/resources/127.0.0.1.sxg.pem
+SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='
+
+IGNORE_CERTIFICATE_ERRORS_SPKI_LIST = [
+    WPT_FINGERPRINT,
+    SXG_WPT_FINGERPRINT
+]
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 91384cb0add..151530897d9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -143,6 +143,7 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
         executor_kwargs["capabilities"] = capabilities
     executor_kwargs["debug"] = run_info_data["debug"]
     executor_kwargs["ccov"] = run_info_data.get("ccov", False)
+    executor_kwargs["browser_version"] = run_info_data.get("browser_version")
     return executor_kwargs
 
 
@@ -187,18 +188,22 @@ def run_info_extras(**kwargs):
     if sw_e10s_override is not None:
         rv["sw-e10s"] = sw_e10s_override
 
-    rv.update(run_info_browser_version(kwargs["binary"]))
+    rv.update(run_info_browser_version(**kwargs))
+
     return rv
 
 
-def run_info_browser_version(binary):
+def run_info_browser_version(**kwargs):
     try:
-        version_info = mozversion.get_version(binary)
+        version_info = mozversion.get_version(kwargs["binary"])
     except mozversion.errors.VersionError:
         version_info = None
     if version_info:
-        return {"browser_build_id": version_info.get("application_buildid", None),
-                "browser_changeset": version_info.get("application_changeset", None)}
+        rv = {"browser_build_id": version_info.get("application_buildid", None),
+              "browser_changeset": version_info.get("application_changeset", None)}
+        if "browser_version" not in kwargs:
+            rv["browser_version"] = version_info.get("application_version")
+        return rv
     return {}
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index e0e6aba0f57..9c1f4f366d5 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -860,7 +860,8 @@ class MarionetteRefTestExecutor(RefTestExecutor):
                  screenshot_cache=None, close_after_done=True,
                  debug_info=None, reftest_internal=False,
                  reftest_screenshot="unexpected", ccov=False,
-                 group_metadata=None, capabilities=None, debug=False, **kwargs):
+                 group_metadata=None, capabilities=None, debug=False,
+                 browser_version=None, **kwargs):
         """Marionette-based executor for reftests"""
         RefTestExecutor.__init__(self,
                                  logger,
@@ -873,9 +874,11 @@ class MarionetteRefTestExecutor(RefTestExecutor):
                                            timeout_multiplier, kwargs["e10s"],
                                            ccov)
         self.implementation = self.get_implementation(reftest_internal)
-        self.implementation_kwargs = ({"screenshot": reftest_screenshot} if
-                                      reftest_internal else {})
-
+        self.implementation_kwargs = {}
+        if reftest_internal:
+            self.implementation_kwargs["screenshot"] = reftest_screenshot
+            self.implementation_kwargs["chrome_scope"] = (browser_version is not None and
+                                                          int(browser_version.split(".")[0]) < 82)
         self.close_after_done = close_after_done
         self.has_window = False
         self.original_pref_values = {}
@@ -980,22 +983,26 @@ class InternalRefTestImplementation(RefTestImplementation):
     def __init__(self, executor):
         self.timeout_multiplier = executor.timeout_multiplier
         self.executor = executor
+        self.chrome_scope = False
 
     @property
     def logger(self):
         return self.executor.logger
 
-    def setup(self, screenshot="unexpected"):
+    def setup(self, screenshot="unexpected", chrome_scope=False):
         data = {"screenshot": screenshot, "isPrint": self.executor.is_print}
         if self.executor.group_metadata is not None:
             data["urlCount"] = {urljoin(self.executor.server_url(key[0]), key[1]):value
                                 for key, value in iteritems(
                                     self.executor.group_metadata.get("url_count", {}))
                                 if value > 1}
-        self.executor.protocol.marionette.set_context(self.executor.protocol.marionette.CONTEXT_CHROME)
+        self.chrome_scope = chrome_scope
+        if chrome_scope:
+            self.logger.debug("Using marionette Chrome scope for reftests")
+            self.executor.protocol.marionette.set_context(self.executor.protocol.marionette.CONTEXT_CHROME)
         self.executor.protocol.marionette._send_message("reftest:setup", data)
 
-    def reset(self, screenshot=None):
+    def reset(self, **kwargs):
         # this is obvious wrong; it shouldn't be a no-op
         # see https://github.com/web-platform-tests/wpt/issues/15604
         pass
@@ -1024,7 +1031,9 @@ class InternalRefTestImplementation(RefTestImplementation):
         try:
             if self.executor.protocol.marionette and self.executor.protocol.marionette.session_id:
                 self.executor.protocol.marionette._send_message("reftest:teardown", {})
-                self.executor.protocol.marionette.set_context(self.executor.protocol.marionette.CONTEXT_CONTENT)
+                if self.chrome_scope:
+                    self.executor.protocol.marionette.set_context(
+                        self.executor.protocol.marionette.CONTEXT_CONTENT)
                 # the reftest runner opens/closes a window with focus, so as
                 # with after closing a window we need to give a new window
                 # focus
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/stability.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/stability.py
index 605b40281a1..88d1c232bfb 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/stability.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/stability.py
@@ -340,14 +340,14 @@ def check_stability(logger, repeat_loop=10, repeat_restart=5, chaos_mode=True, m
                     output_results=True, **kwargs):
     kwargs_extras = [{}]
     if chaos_mode and kwargs["product"] == "firefox":
-        kwargs_extras.append({"chaos_mode_flags": 3})
+        kwargs_extras.append({"chaos_mode_flags": "0xfb"})
 
     steps = get_steps(logger, repeat_loop, repeat_restart, kwargs_extras)
 
     start_time = datetime.now()
     step_results = []
 
-    github_checks_outputter = get_gh_checks_outputter(kwargs)
+    github_checks_outputter = get_gh_checks_outputter(kwargs["github_checks_text_file"])
 
     for desc, step_func in steps:
         if max_time and datetime.now() - start_time > max_time:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
index af1b00725dc..4a3fa427365 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
@@ -208,6 +208,7 @@ class TestLoader(object):
                  total_chunks=1,
                  chunk_number=1,
                  include_https=True,
+                 include_h2=True,
                  include_quic=False,
                  skip_timeout=False,
                  skip_implementation_status=None,
@@ -222,6 +223,7 @@ class TestLoader(object):
         self.tests = None
         self.disabled_tests = None
         self.include_https = include_https
+        self.include_h2 = include_h2
         self.include_quic = include_quic
         self.skip_timeout = skip_timeout
         self.skip_implementation_status = skip_implementation_status
@@ -309,6 +311,8 @@ class TestLoader(object):
             enabled = not test.disabled()
             if not self.include_https and test.environment["protocol"] == "https":
                 enabled = False
+            if not self.include_h2 and test.environment["protocol"] == "h2":
+                enabled = False
             if not self.include_quic and test.environment["quic"]:
                 enabled = False
             if self.skip_timeout and test.expected() == "TIMEOUT":
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index 4c9468a0eba..0bde5ba348e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -645,8 +645,12 @@ class TestRunnerManager(threading.Thread):
         known_intermittent = test.known_intermittent()
         status = status_subns.get(file_result.status, file_result.status)
 
-        if self.browser.check_crash(test.id):
-            status = "CRASH"
+        if self.browser.check_crash(test.id) and status != "CRASH":
+            if test.test_type == "crashtest":
+                self.logger.info("Found a crash dump file; changing status to CRASH")
+                status = "CRASH"
+            else:
+                self.logger.warning("Found a crash dump; should change status from %s to CRASH but this causes instability" % (status,))
 
         self.test_count += 1
         is_unexpected = expected != status and status not in known_intermittent
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py
index 836003d1060..394d2a00177 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_testloader.py
@@ -1,14 +1,19 @@
 from __future__ import unicode_literals
 
+import os
 import sys
 import tempfile
 
 import pytest
 
 from mozlog import structured
-from ..testloader import TestFilter as Filter
+from ..testloader import TestFilter as Filter, TestLoader as Loader
 from .test_wpttest import make_mock_manifest
 
+here = os.path.dirname(__file__)
+sys.path.insert(0, os.path.join(here, os.pardir, os.pardir, os.pardir))
+from manifest.manifest import Manifest as WPTManifest
+
 structured.set_default_logger(structured.structuredlog.StructuredLogger("TestLoader"))
 
 include_ini = """\
@@ -18,6 +23,42 @@ skip: true
 """
 
 
+def test_loader_h2_tests():
+    manifest_json = {
+        "items": {
+            "testharness": {
+                "a": {
+                    "foo.html": [
+                        "abcdef123456",
+                        [None, {}],
+                    ],
+                    "bar.h2.html": [
+                        "uvwxyz987654",
+                        [None, {}],
+                    ],
+                }
+            }
+        },
+        "url_base": "/",
+        "version": 8,
+    }
+    manifest = WPTManifest.from_json("/", manifest_json)
+
+    # By default, the loader should include the h2 test.
+    loader = Loader({manifest: {"metadata_path": ""}}, ["testharness"], None)
+    assert "testharness" in loader.tests
+    assert len(loader.tests["testharness"]) == 2
+    assert len(loader.disabled_tests) == 0
+
+    # We can also instruct it to skip them.
+    loader = Loader({manifest: {"metadata_path": ""}}, ["testharness"], None, include_h2=False)
+    assert "testharness" in loader.tests
+    assert len(loader.tests["testharness"]) == 1
+    assert "testharness" in loader.disabled_tests
+    assert len(loader.disabled_tests["testharness"]) == 1
+    assert loader.disabled_tests["testharness"][0].url == "/a/bar.h2.html"
+
+
 @pytest.mark.xfail(sys.platform == "win32",
                    reason="NamedTemporaryFile cannot be reopened on Win32")
 def test_filter_unicode():
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py
index 1de951938cf..896d8a0d2c6 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py
@@ -3,6 +3,8 @@ from functools import partial
 
 from mozlog import get_default_logger
 
+from wptserve.utils import isomorphic_decode
+
 logger = None
 
 def vcs(bin_name):
@@ -23,7 +25,9 @@ def vcs(bin_name):
 
         proc_kwargs = {}
         if repo is not None:
-            proc_kwargs["cwd"] = repo
+            # Make sure `cwd` is str type to work in different sub-versions of Python 3.
+            # Before 3.8, bytes were not accepted on Windows for `cwd`.
+            proc_kwargs["cwd"] = isomorphic_decode(repo)
         if stdout is not None:
             proc_kwargs["stdout"] = stdout
         if stdin is not None:
@@ -57,4 +61,4 @@ def is_git_root(path, log_error=True):
         rv = git("rev-parse", "--show-cdup", repo=path, log_error=log_error)
     except subprocess.CalledProcessError:
         return False
-    return rv == "\n"
+    return rv == b"\n"
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index ea586825616..532c795cd3c 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -5,7 +5,7 @@ import sys
 from collections import OrderedDict
 from distutils.spawn import find_executable
 from datetime import timedelta
-from six import iterkeys, itervalues, iteritems
+from six import ensure_text, iterkeys, itervalues, iteritems
 
 from . import config
 from . import wpttest
@@ -350,7 +350,7 @@ scheme host and port.""")
 
     taskcluster_group = parser.add_argument_group("Taskcluster-specific")
     taskcluster_group.add_argument("--github-checks-text-file",
-                                   dest="github_checks_text_file",
+                                   type=ensure_text,
                                    help="Path to GitHub checks output file")
 
     webkit_group = parser.add_argument_group("WebKit-specific")
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index f033205a00b..897b4a9f815 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -5,6 +5,7 @@ import os
 import sys
 from six import iteritems, itervalues
 
+import wptserve
 from wptserve import sslutils
 
 from . import environment as env
@@ -75,6 +76,7 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
                                                       explicit=kwargs["default_exclude"]))
 
     ssl_enabled = sslutils.get_cls(kwargs["ssl_type"]).ssl_enabled
+    h2_enabled = wptserve.utils.http2_compatible()
     test_loader = testloader.TestLoader(test_manifests,
                                         kwargs["test_types"],
                                         run_info,
@@ -83,6 +85,7 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
                                         total_chunks=kwargs["total_chunks"],
                                         chunk_number=kwargs["this_chunk"],
                                         include_https=ssl_enabled,
+                                        include_h2=h2_enabled,
                                         include_quic=kwargs["enable_quic"],
                                         skip_timeout=kwargs["skip_timeout"],
                                         skip_implementation_status=kwargs["skip_implementation_status"],
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
index c670179c81a..31b245612be 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
@@ -101,7 +101,7 @@ class RunInfo(dict):
         except (OSError, subprocess.CalledProcessError):
             rev = None
         if rev:
-            self["revision"] = rev
+            self["revision"] = rev.decode("utf-8")
 
         self["python_version"] = sys.version_info.major
         self["product"] = product
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/docs/index.rst b/tests/wpt/web-platform-tests/tools/wptserve/docs/index.rst
index a9f630c760f..c6157b4f8c4 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/docs/index.rst
+++ b/tests/wpt/web-platform-tests/tools/wptserve/docs/index.rst
@@ -3,8 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Web Platform Test Server
-========================
+wptserve: Web Platform Test Server
+==================================
 
 A python-based HTTP server specifically targeted at being used for
 testing the web platform. This means that extreme flexibility —
@@ -25,11 +25,3 @@ Contents:
    handlers
    pipes
 
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
index 52788438336..0c487c57d4d 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/functional/test_pipes.py
@@ -42,6 +42,14 @@ class TestHeader(TestUsingServer):
         resp = self.request("/document.txt", query="pipe=header(Refresh,3;url=http://example.com)")
         self.assertEqual(resp.info()["Refresh"], "3;url=http://example.com")
 
+    def test_escape_comma(self):
+        resp = self.request("/document.txt", query="pipe=header(Expires,Thu\,%2014%20Aug%201986%2018:00:00%20GMT)")
+        self.assertEqual(resp.info()["Expires"], "Thu, 14 Aug 1986 18:00:00 GMT")
+
+    def test_escape_parenthesis(self):
+        resp = self.request("/document.txt", query="pipe=header(User-Agent,Mozilla/5.0%20(X11;%20Linux%20x86_64;%20rv:12.0\)")
+        self.assertEqual(resp.info()["User-Agent"], "Mozilla/5.0 (X11; Linux x86_64; rv:12.0)")
+
 class TestSlice(TestUsingServer):
     def test_both_bounds(self):
         resp = self.request("/document.txt", query="pipe=slice(1,10)")
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
index 2cc25e2c21c..6677ab394b7 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/handlers.py
@@ -407,7 +407,7 @@ class AsIsHandler(object):
         path = filesystem_path(self.base_path, request, self.url_base)
 
         try:
-            with open(path) as f:
+            with open(path, 'rb') as f:
                 response.writer.write_raw_content(f.read())
             wrap_pipeline(path, request, response)
             response.close_connection = True
diff --git a/tests/wpt/web-platform-tests/url/resources/setters_tests.json b/tests/wpt/web-platform-tests/url/resources/setters_tests.json
index db217da23d5..d06fb2cfe62 100644
--- a/tests/wpt/web-platform-tests/url/resources/setters_tests.json
+++ b/tests/wpt/web-platform-tests/url/resources/setters_tests.json
@@ -1324,6 +1324,27 @@
                 "hostname": "test",
                 "port": "12"
             }
+        },
+        {
+            "comment": "Drop /. from path",
+            "href": "non-spec:/.//p",
+            "new_value": "h",
+            "expected": {
+                "href": "non-spec://h//p",
+                "host": "h",
+                "hostname": "h",
+                "pathname": "//p"
+            }
+        },
+        {
+            "href": "non-spec:/.//p",
+            "new_value": "",
+            "expected": {
+                "href": "non-spec:////p",
+                "host": "",
+                "hostname": "",
+                "pathname": "//p"
+            }
         }
     ],
     "port": [
@@ -1672,6 +1693,40 @@
                 "href": "file:///",
                 "pathname": "/"
             }
+        },
+        {
+            "comment": "Serialize /. in path",
+            "href": "non-spec:/",
+            "new_value": "/.//p",
+            "expected": {
+                "href": "non-spec:/.//p",
+                "pathname": "//p"
+            }
+        },
+        {
+            "href": "non-spec:/",
+            "new_value": "/..//p",
+            "expected": {
+                "href": "non-spec:/.//p",
+                "pathname": "//p"
+            }
+        },
+        {
+            "href": "non-spec:/",
+            "new_value": "//p",
+            "expected": {
+                "href": "non-spec:/.//p",
+                "pathname": "//p"
+            }
+        },
+        {
+            "comment": "Drop /. from path",
+            "href": "non-spec:/.//",
+            "new_value": "p",
+            "expected": {
+                "href": "non-spec:/p",
+                "pathname": "/p"
+            }
         }
     ],
     "search": [
diff --git a/tests/wpt/web-platform-tests/url/resources/urltestdata.json b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
index bc79426526c..76a8b3a015d 100644
--- a/tests/wpt/web-platform-tests/url/resources/urltestdata.json
+++ b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
@@ -6445,6 +6445,190 @@
     "search": "",
     "hash": ""
   },
+  "Serialize /. in path",
+  {
+    "input": "non-spec:/.//",
+    "base": "about:blank",
+    "href": "non-spec:/.//",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-spec:/..//",
+    "base": "about:blank",
+    "href": "non-spec:/.//",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-spec:/a/..//",
+    "base": "about:blank",
+    "href": "non-spec:/.//",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-spec:/.//path",
+    "base": "about:blank",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-spec:/..//path",
+    "base": "about:blank",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "non-spec:/a/..//path",
+    "base": "about:blank",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/.//path",
+    "base": "non-spec:/p",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "/..//path",
+    "base": "non-spec:/p",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "..//path",
+    "base": "non-spec:/p",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "a/..//path",
+    "base": "non-spec:/p",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "",
+    "base": "non-spec:/..//p",
+    "href": "non-spec:/.//p",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//p",
+    "search": "",
+    "hash": ""
+  },
+  {
+    "input": "path",
+    "base": "non-spec:/..//p",
+    "href": "non-spec:/.//path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "//path",
+    "search": "",
+    "hash": ""
+  },
+  "Do not serialize /. in path",
+  {
+    "input": "../path",
+    "base": "non-spec:/.//p",
+    "href": "non-spec:/path",
+    "protocol": "non-spec:",
+    "username": "",
+    "password": "",
+    "host": "",
+    "hostname": "",
+    "port": "",
+    "pathname": "/path",
+    "search": "",
+    "hash": ""
+  },
   "# percent encoded hosts in non-special-URLs",
   {
     "input": "non-special://%E2%80%A0/",
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/idlharness.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/idlharness.any.js
index a2de9de859e..98713d4bf6e 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/idlharness.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/idlharness.any.js
@@ -6,32 +6,17 @@
 
 // https://webassembly.github.io/spec/js-api/
 
-promise_test(async () => {
-  const srcs = ['wasm-js-api'];
-  const [wasm] = await Promise.all(
-    srcs.map(i => fetch(`/interfaces/${i}.idl`).then(r => r.text())));
-
-  const idl_array = new IdlArray();
-  idl_array.add_idls(wasm, {
-    // Note the prose requirements in the specification.
-    except: ['CompileError', 'LinkError', 'RuntimeError']
-  });
-
-  // Ignored errors are surfaced in idlharness.js's test_object below.
-  try {
-    self.memory = new WebAssembly.Memory({initial: 1024});
-  } catch (e) { }
-
-  try {
+idl_test(
+  ['wasm-js-api'],
+  [],
+  async idl_array => {
     self.mod = await createWasmModule();
     self.instance = new WebAssembly.Instance(self.mod);
-  } catch (e) { }
-
-  idl_array.add_objects({
-    Memory: ['memory'],
-    Module: ['mod'],
-    Instance: ['instance'],
-  });
-  idl_array.test();
-}, 'wasm-js-api interfaces.');
 
+    idl_array.add_objects({
+      Memory: [new WebAssembly.Memory({initial: 1024})],
+      Module: [self.mod],
+      Instance: [self.instance],
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.js
new file mode 100644
index 00000000000..764aac78670
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.js
@@ -0,0 +1,20 @@
+// META: global=jsshell
+// META: script=/wasm/jsapi/assertions.js
+// META: script=/wasm/jsapi/memory/assertions.js
+
+test(() => {
+    const argument = { initial: 5, minimum: 6 };
+    assert_throws_js(TypeError, () => new WebAssembly.Memory(argument));
+}, "Initializing with both initial and minimum");
+
+test(() => {
+    const argument = { minimum: 0 };
+    const memory = new WebAssembly.Memory(argument);
+    assert_Memory(memory, { "size": 0 });
+  }, "Zero minimum");
+
+  test(() => {
+    const argument = { minimum: 4 };
+    const memory = new WebAssembly.Memory(argument);
+    assert_Memory(memory, { "size": 4 });
+  }, "Non-zero minimum");
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor.any.js
index 6524c8acc49..30cc8ef9885 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/memory/constructor.any.js
@@ -72,7 +72,16 @@ test(() => {
       assert_unreached(`Should not call [[HasProperty]] with ${x}`);
     },
     get(o, x) {
-      return 0;
+      // Due to the requirement not to supply both minimum and initial, we need to ignore one of them.
+      switch (x) {
+        case "shared":
+          return false;
+        case "minimum":
+        case "maximum":
+          return 0;
+        default:
+          return undefined;
+      }
     },
   });
   new WebAssembly.Memory(proxy);
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/assertions.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/assertions.js
index b1aeaf1a65d..19cc5c3b92d 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/table/assertions.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/assertions.js
@@ -11,3 +11,14 @@ function assert_equal_to_array(table, expected, message) {
   assert_throws_js(RangeError, () => table.get(expected.length + 1),
                    `${message}: table.get(${expected.length + 1} of ${expected.length})`);
 }
+
+function assert_Table(actual, expected) {
+  assert_equals(Object.getPrototypeOf(actual), WebAssembly.Table.prototype,
+                "prototype");
+  assert_true(Object.isExtensible(actual), "extensible");
+
+  assert_equals(actual.length, expected.length, "length");
+  for (let i = 0; i < expected.length; ++i) {
+    assert_equals(actual.get(i), null, `actual.get(${i})`);
+  }
+}
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.js
new file mode 100644
index 00000000000..09ab18a2d8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.js
@@ -0,0 +1,20 @@
+// META: global=jsshell
+// META: script=/wasm/jsapi/assertions.js
+// META: script=/wasm/jsapi/table/assertions.js
+
+test(() => {
+  const argument = { "element": "anyfunc", "initial": 0, "minimum": 0 };
+  assert_throws_js(TypeError, () => WebAssembly.Table(argument));
+}, "Supplying both initial and minimum");
+
+test(() => {
+  const argument = { "element": "anyfunc", "minimum": 0 };
+  const table = new WebAssembly.Table(argument);
+  assert_Table(table, { "length": 0 });
+}, "Basic (zero, minimum)");
+
+test(() => {
+  const argument = { "element": "anyfunc", "minimum": 5 };
+  const table = new WebAssembly.Table(argument);
+  assert_Table(table, { "length": 5 });
+}, "Basic (non-zero, minimum)");
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor.any.js b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor.any.js
index e9e77a132b7..794976e8266 100644
--- a/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor.any.js
+++ b/tests/wpt/web-platform-tests/wasm/jsapi/table/constructor.any.js
@@ -1,16 +1,6 @@
 // META: global=window,dedicatedworker,jsshell
 // META: script=/wasm/jsapi/assertions.js
-
-function assert_Table(actual, expected) {
-  assert_equals(Object.getPrototypeOf(actual), WebAssembly.Table.prototype,
-                "prototype");
-  assert_true(Object.isExtensible(actual), "extensible");
-
-  assert_equals(actual.length, expected.length, "length");
-  for (let i = 0; i < expected.length; ++i) {
-    assert_equals(actual.get(i), null, `actual.get(${i})`);
-  }
-}
+// META: script=/wasm/jsapi/table/assertions.js
 
 test(() => {
   assert_function_name(WebAssembly.Table, "Table", "WebAssembly.Table");
diff --git a/tests/wpt/web-platform-tests/web-animations/testcommon.js b/tests/wpt/web-platform-tests/web-animations/testcommon.js
index baa7550d660..933ee95af2b 100644
--- a/tests/wpt/web-platform-tests/web-animations/testcommon.js
+++ b/tests/wpt/web-platform-tests/web-animations/testcommon.js
@@ -25,6 +25,15 @@ if (!window.assert_times_equal) {
   };
 }
 
+// Allow implementations to substitute an alternative method for comparing
+// times based on their precision requirements.
+if (!window.assert_time_greater_than_equal) {
+ window.assert_time_greater_than_equal = (actual, expected, description) => {
+    assert_greater_than_equal(actual, expected - 2 * TIME_PRECISION,
+                              description);
+  };
+}
+
 // Allow implementations to substitute an alternative method for comparing
 // a time value based on its precision requirements with a fixed value.
 if (!window.assert_time_equals_literal) {
@@ -305,4 +314,4 @@ function assert_phase_at_time(animation, phase, currentTime) {
                       + ` is ${currentTime}ms`
                       + ' (progress is non-null with appropriate fill mode)');
   }
-}
\ No newline at end of file
+}
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html
index 7e98ef4260f..d4f802152c5 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/setting-the-timeline-of-an-animation.html
@@ -65,8 +65,8 @@ test(t => {
   animation.timeline = document.timeline;
 
   assert_equals(animation.playState, 'running');
-}, 'After setting timeline on an idle animation with a start time'
-   + ' it is running');
+}, 'After transitioning from a null timeline on an animation with a start time'
+   + ' it is still running');
 
 test(t => {
   const animation =
@@ -78,8 +78,8 @@ test(t => {
   animation.timeline = document.timeline;
 
   assert_equals(animation.playState, 'finished');
-}, 'After setting timeline on an idle animation with a sufficiently ancient'
-   + ' start time it is finished');
+}, 'After transitioning from a null timeline on an animation with a ' +
+   'sufficiently ancient start time it is finished');
 
 promise_test(async t => {
   const animation =
@@ -152,9 +152,9 @@ test(t => {
 
   animation.timeline = null;
 
-  assert_equals(animation.playState, 'idle');
+  assert_equals(animation.playState, 'running');
   assert_times_equal(animation.startTime, initialStartTime);
-}, 'After clearing timeline on finished animation it is idle');
+}, 'After clearing timeline on finished animation it is running');
 
 test(t => {
   const animation =
@@ -166,9 +166,9 @@ test(t => {
 
   animation.timeline = null;
 
-  assert_equals(animation.playState, 'idle');
+  assert_equals(animation.playState, 'running');
   assert_times_equal(animation.startTime, initialStartTime);
-}, 'After clearing timeline on running animation it is idle');
+}, 'After clearing timeline on running animation it is still running');
 
 test(t => {
   const animation =
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/__dir__.headers b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/__dir__.headers
new file mode 100644
index 00000000000..cb762eff806
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/__dir__.headers
@@ -0,0 +1 @@
+Access-Control-Allow-Origin: *
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/classic_script.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/classic_script.js
new file mode 100644
index 00000000000..db69b96188d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic/classic_script.js
@@ -0,0 +1 @@
+window.report_result('classic script from network');
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/classic_script.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/classic_script.js
new file mode 100644
index 00000000000..5fcf045906c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic1/classic_script.js
@@ -0,0 +1 @@
+window.report_result('classic script from dynamic1.wbn');
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/classic_script.js b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/classic_script.js
new file mode 100644
index 00000000000..546d8a503d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/dynamic2/classic_script.js
@@ -0,0 +1 @@
+window.report_result('classic script from dynamic2.wbn');
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
index c3dd8ebc720..860327fe245 100755
--- a/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
+++ b/tests/wpt/web-platform-tests/web-bundle/resources/generate-test-wbns.sh
@@ -22,8 +22,8 @@ gen-bundle \
 
 gen-bundle \
   -version b1 \
-  -baseURL https://subresource-wbn.example/ \
-  -primaryURL https://subresource-wbn.example/root.js \
+  -baseURL $wpt_test_http_origin/ \
+  -primaryURL $wpt_test_http_origin/root.js \
   -dir subresource/ \
   -o wbn/subresource.wbn
 
@@ -40,3 +40,10 @@ gen-bundle \
   -primaryURL $wpt_test_http_origin/web-bundle/resources/dynamic/resource1.js \
   -dir dynamic2/ \
   -o wbn/dynamic2.wbn
+
+gen-bundle \
+  -version b1 \
+  -baseURL $wpt_test_https_origin/web-bundle/resources/dynamic/ \
+  -primaryURL $wpt_test_https_origin/web-bundle/resources/dynamic/resource1.js \
+  -dir dynamic1/ \
+  -o wbn/dynamic1-crossorigin.wbn
diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1-crossorigin.wbn
new file mode 100644
index 0000000000000000000000000000000000000000..5ebb86178e9bf5cccfa09878210c7866f9d80478
GIT binary patch
literal 1487
zcmdUuJx>BL7{@{5;wON?q#K$D_rj^<j0wI)Vmv3KY^K+Hz?!3NuFnaqpiT}ZE^bcx
zDU6Hmeic7~u>v}=i31&*_V@h$>A%;tkB6JvkB7UbozTf-I<+%IrG3k4Ls(QX#fD5;
zB?OIr#q+$uc9@DN1}gzA(}aPxqOPDV&VF~C(z!ml1TG@z<g@qOoK#Y1(D~Wt-s9wE
z^sBkI+{<Kmu5s>H^V!~{faM`@raCF0Hv)bdVDOh`Vlma4vs29yu5duj=3cLQ^~=XS
zUn9j-Z@adAz@$JBSj4V^W2#il8AUFIbxtqn@Nz&I1BJzeiYDmYuxpwU7(5nRGU5#m
zQGFqhVwt!e*-V?nwOyOoYrbv!-YVG(jt+l@#2}h@wzX2J`)yMk*)AoZWP+!rJZX%J
zg^@KG4knF6w#cY>PN^M=!qWQue?>S-!9;M#ej1M=xV}^I%g)#c<@ySAzTJrlr;!X3
fkPTA!`7+KJ{pqoHr`o<e)%M<4`&wqO=H9;mi)j{j

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic1.wbn
index 22db19e7ce14d40cc4ba87d120486c24da1a4070..9e69e1fd89834bd2d238859413fc8e09d8b6b181 100644
GIT binary patch
delta 329
zcmdnUd6IiVlECE5qSWGo{Ji4SVoBybO-m;paOE)6%PMYmkT^1NpD(i{W7EWa?wrP8
zAxS0&Acxlk%K0a;ufk`dptX2%PGWI!W^#OSa#3bM30Rg<;&AKa4UDlOMkWf5rRfSr
z21W)72If`<2396!lNFgnZ7m|K$}{s)^2_y#QVa5nO5%YIDa|R-P=}hP05MG=ttdZN
zA*C`eF*h^WP_H~GPhHcR3uttNWJqbMj)IY)f>&t{)O;f=LklZoL!kLf@yeP{7GusM
QpyCQa6_Z$GnOIK(07l4U0RR91

delta 195
zcmX@fy^(W5l7L-iQEG8PeqM2Eu_V*arX>>(y0RPUWfeC&Fiza>%OtUXGC!jq6Jzb<
zct(E~Yl(d=lTR>3Nc!gI=_nW)D|nUWC>R+S87LT-S{WKy8JbMCWL}C_)_k%aOCA9g
hZ-6SoQ&WI8m?GI=Xk}z(Wn=`j!F=*6R#_&NjR3Y-Hmv{v

diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/dynamic2.wbn
index 44c4b1ee86662af2b474447335267cf7b274e62b..e4d04d60c2aa9050c6454ad9f88af407a844669d 100644
GIT binary patch
delta 329
zcmdnUd6IiVlECE5qSWGo{Ji4SVoBybO-m;paOE)6%PMYmkT^1NpD(i{W7EWa?wrP8
zAxS0&Acxlk%K0a;ufk`dptX2%PGWI!W^#OSa#3bM30Rg<;&AKa4UDlOMkWf5rRfSr
z21W)72If`<23E!vlNFgnZ7m|K$}{s)^2_y#QVa5nO5%YIDa|R-P=}hP05MG=ttdZN
zA*C`eF*h^WNUuC8PhHcR3uttNWJqbMj)IY)f>&t{)O;f=LklZoL!kLf@yeP{7GusM
QpyCQa6_Z$GnOIK(07xlh0{{R3

delta 195
zcmX@fy^(W5l7L-iQEG8PeqM2Eu_V*arX>>(y0RPUWfeC&Fiza>%OtUXGC!jq6Jzb<
zct(E~Yl(d=lTR>3Nc!gI=_nW)D|nUWC>R+S87LT-S{WKy8JbMCWL}C_)_k%aOCA9g
hZ-6SoQ&WI8m?GI=Xk}z(Wo!(z!F=*6R#_&NjR3ZBHm?8x

diff --git a/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn b/tests/wpt/web-platform-tests/web-bundle/resources/wbn/subresource.wbn
index 395039dc216250729ed75bdab2c10a7f16998f16..4d059e7c0b819500c437529446158d2884915c4c 100644
GIT binary patch
delta 225
zcmeBXX=SNz^Y}2oXTpd1lb5+988R?bsAiOu6j<r&m!~G_7UU$Bq~#ao>XoDxmsnXC
z7#Qjo<>!~^Wfh0Dq-N%&q*h48XBMRv7v$#^rxr^x`Zp~iQh&1pqr}Pzt&9?BJeEyd
rkRutAQL3Y0Xr|y*nxkN3U}T_RU}R-rU}a=7S(R}D9@%q@HjJzQ_3%n_

delta 231
zcmZo=>1L^K^Y}2oXTpd1lb5+988R?bsArUv6ck(O>lc?M6{QyEmlh?b>Xs+v>7`aA
z<`(3n>KEnbm*`~`hqa_;=B1=oNF-+hl@;XY6{i+UGWs_yBHDyz2S$mNiWNEpESxwi
uM>0G$MMuHNM8T^xPr=B*$Uwos%*xov%FuAKJmUmhvIa(zPcYgrasvRqXizr*

diff --git a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
index 27e164afe8b..1e0e78a3204 100644
--- a/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
+++ b/tests/wpt/web-platform-tests/web-bundle/subresource-loading/subresource-loading-from-web-bundle.tentative.html
@@ -8,10 +8,10 @@
 <script src="/resources/testharnessreport.js"></script>
 <body>
   <link id="link-web-bundle" rel="webbundle" href="../resources/wbn/subresource.wbn"
-        resources="https://subresource-wbn.example/root.js https://subresource-wbn.example/submodule.js" />
+        resources="http://web-platform.test:8001/root.js http://web-platform.test:8001/submodule.js" />
   <script>
     promise_test(async () => {
-      const module = await import('https://subresource-wbn.example/root.js');
+      const module = await import('http://web-platform.test:8001/root.js');
       assert_equals(module.result, 'OK');
     }, "Subresource loading with WebBundle");
 
@@ -38,8 +38,37 @@
       document.body.removeChild(link);
       const module4 = await import('http://web-platform.test:8001/web-bundle/resources/dynamic/resource4.js');
       assert_equals(module4.result, 'resource4 from network');
+
+      // Module scripts are stored to the Document's module map once loaded.
+      // So import()ing the same module script will reuse the previously loaded
+      // script.
+      const module_second = await import('http://web-platform.test:8001/web-bundle/resources/dynamic/resource1.js');
+      assert_equals(module_second.result, 'resource1 from dynamic1.wbn');
     }, 'Dynamically adding / updating / removing "<link rel=webbundle>"');
 
+    promise_test(async () => {
+      const classic_script_url = 'http://web-platform.test:8001/web-bundle/resources/dynamic/classic_script.js';
+      const link = document.createElement("link");
+      link.rel = "webbundle";
+      link.href = "../resources/wbn/dynamic1.wbn";
+      link.resources.add(classic_script_url);
+      document.body.appendChild(link);
+      assert_equals(
+        await loadScriptAndWaitReport(classic_script_url),
+        'classic script from dynamic1.wbn');
+      link.href = "../resources/wbn/dynamic2.wbn";
+      // Loading the classic script should not reuse the previously loaded
+      // script. So in this case, the script must be loaded from dynamic2.wbn.
+      assert_equals(
+        await loadScriptAndWaitReport(classic_script_url),
+        'classic script from dynamic2.wbn');
+      document.body.removeChild(link);
+      // And in this case, the script must be loaded from network.
+      assert_equals(
+        await loadScriptAndWaitReport(classic_script_url),
+        'classic script from network');
+    }, 'Dynamically loading classic script from web bundle');
+
     promise_test(() => {
       return addLinkAndWaitForLoad("../resources/wbn/dynamic1.wbn?test-event");
     }, '<link rel="webbundle"> fires a load event on load success');
@@ -48,9 +77,19 @@
       return addLinkAndWaitForError("../resources/wbn/nonexistent.wbn");
     }, '<link rel="webbundle"> fires an error event on load failure');
 
+    promise_test(async () => {
+      const link = document.createElement('link');
+      link.rel = 'webbundle';
+      link.href = '../resources/wbn/dynamic1-crossorigin.wbn';
+      link.resources = 'https://web-platform.test:8444/web-bundle/resources/dynamic/resource1.js';
+      document.body.appendChild(link);
+      const module = await import(link.resources);
+      assert_equals(module.result, 'resource1 from network');
+    }, 'Subresource URL must be same-origin with bundle URL');
+
     promise_test(async () => {
       const wbn_url = 'http://web-platform.test:8001/web-bundle/resources/wbn/subresource.wbn?test-resources-update';
-      const resource_url = 'https://subresource-wbn.example/submodule.js';
+      const resource_url = 'http://web-platform.test:8001/submodule.js';
       const link = await addLinkAndWaitForLoad(wbn_url);
       link.resources.add(resource_url);
       const resp = await fetch(resource_url, {cache: 'no-store'});
@@ -79,5 +118,17 @@
         document.body.appendChild(link);
       });
     }
+
+    async function loadScriptAndWaitReport(script_url) {
+      const result_promise = new Promise((resolve) => {
+          // This function will be called from script.js
+          window.report_result = resolve;
+        });
+
+      const script = document.createElement('script');
+      script.src = script_url;
+      document.body.appendChild(script);
+      return result_promise;
+    }
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_write.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_write.https.html
index e2bbd57bbe9..57fd300a34f 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_write.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_write.https.html
@@ -382,57 +382,21 @@ nfc_test(async (t, mockNFC) => {
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
   await writer.write(test_text_data);
-  assertNDEFWriteOptionsEqual(createNDEFWriteOptions(true),
-                            mockNFC.writeOptions());
+  assertNDEFWriteOptionsEqual({overwrite: true}, mockNFC.writeOptions());
 }, "Check that default NDEFWriteOptions values are correctly set.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  let ndefWriteOptions = createNDEFWriteOptions(false);
-  await writer.write(test_text_data, ndefWriteOptions);
-  assertNDEFWriteOptionsEqual(ndefWriteOptions, mockNFC.writeOptions());
+  await writer.write(test_text_data, {overwrite: false});
+  assertNDEFWriteOptionsEqual({overwrite: false}, mockNFC.writeOptions());
 }, "Check that provided NDEFWriteOptions values are correctly converted.");
 
-nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
-  const message = createMessage([createTextRecord(test_text_data)]);
-  const controller = new AbortController();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  await reader.scan({ signal: controller.signal });
-
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data, { ignoreRead: false });
-  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-
-  mockNFC.setReadingMessage(message);
-  await readerWatcher.wait_for("reading").then(event => {
-    controller.abort();
-    assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
-  });
-
-}, "NDEFWriter.write should read data when ignoreRead is false.");
-
-nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
-  const message = createMessage([createTextRecord(test_text_data)]);
-  // Ignore reading if NDEFWriteOptions.ignoreRead is true
-  reader.onreading = t.unreached_func("reading event should not be fired.");
-  await reader.scan();
-
-  const writer = new NDEFWriter();
-  await writer.write(test_text_data, { ignoreRead: true });
-  mockNFC.setReadingMessage(message);
-  assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-}, "NDEFWriter.write should ignore reading data when ignoreRead is true.");
-
 nfc_test(async (t, mockNFC) => {
   const writer1 = new NDEFWriter();
   const writer2 = new NDEFWriter();
 
-  const ndefWriteOptions1 = createNDEFWriteOptions( false);
-  const ndefWriteOptions2 = createNDEFWriteOptions(true);
-  const p1 = writer1.write(test_text_data, ndefWriteOptions1);
-  const p2 = writer2.write(test_url_data, ndefWriteOptions2);
+  const p1 = writer1.write(test_text_data, {overwrite: false});
+  const p2 = writer2.write(test_url_data, {overwrite: true});
 
   await new Promise((resolve, reject) => {
     // Make first push pending
@@ -445,7 +409,7 @@ nfc_test(async (t, mockNFC) => {
     });
     p2.then(() => {
       assertNDEFMessagesEqual(test_url_data, mockNFC.pushedMessage());
-      assertNDEFWriteOptionsEqual(ndefWriteOptions2, mockNFC.writeOptions());
+      assertNDEFWriteOptionsEqual( {overwrite: true}, mockNFC.writeOptions());
       assert_equals(err, "AbortError", "the pending push should be aborted");
       resolve();
     });
@@ -478,7 +442,7 @@ NDEF technology.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  await writer.write(test_text_data, { overwrite: false });
+  await writer.write(test_text_data, {overwrite: false});
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
 }, "NDEFWriter.write should succeed to write data to an unformatted NFC device \
 when the NDEFWriteOptions.overwrite is false.");
@@ -487,14 +451,14 @@ nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
   await writer.write(test_buffer_data);
   assertNDEFMessagesEqual(test_buffer_data, mockNFC.pushedMessage());
-  await writer.write(test_text_data, { overwrite: true });
+  await writer.write(test_text_data, {overwrite: true});
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
 }, "NDEFWriter.write should succeed to overwrite the existing data \
 when the NDEFWriteOptions.overwrite is true.");
 
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
-  const p = writer.write(test_text_data, { overwrite: false });
+  const p = writer.write(test_text_data, {overwrite: false});
   mockNFC.setIsFormattedTag(true);
   await promise_rejects_dom(t, 'NotAllowedError', p);
 }, "NDEFWriter.write should fail when there are NDEF records on the NFC device \
diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
index afe101d36aa..13cbe49370e 100644
--- a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
+++ b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
@@ -7,40 +7,35 @@
 // these tests the browser must be run with these options:
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
-let loadChromiumResources = Promise.resolve().then(() => {
-  if (!window.MojoInterfaceInterceptor) {
-    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
-    // not present in the global namespace.
-    return;
-  }
 
-  let chain = Promise.resolve();
-  [
-    '/gen/layout_test_data/mojo/public/js/mojo_bindings.js',
-    '/gen/services/device/public/mojom/nfc.mojom.js',
-    '/resources/testdriver.js',
-    '/resources/testdriver-vendor.js',
-    '/resources/chromium/nfc-mock.js',
-  ].forEach(path => {
-    let script = document.createElement('script');
-    script.src = path;
-    script.async = false;
-    chain = chain.then(() => new Promise(resolve => {
-      script.onload = resolve;
-    }));
-    document.head.appendChild(script);
-  });
+async function loadChromiumResources() {
+  const chromiumResources = [
+  '/gen/services/device/public/mojom/nfc.mojom.js',
+  ];
 
-  return chain;
-});
+  await loadMojoResources(chromiumResources);
+  await loadScript('/resources/testdriver.js');
+  await loadScript('/resources/testdriver-vendor.js');
+  await loadScript('/resources/chromium/nfc-mock.js');
+}
 
 async function initialize_nfc_tests() {
   if (typeof WebNFCTest === 'undefined') {
-    await loadChromiumResources;
+    const script = document.createElement('script');
+    script.src = '/resources/test-only-api.js';
+    script.async = false;
+    const p = new Promise((resolve, reject) => {
+      script.onload = () => { resolve(); };
+      script.onerror = e => { reject(e); };
+    })
+    document.head.appendChild(script);
+    await p;
+
+    if (isChromiumBased) {
+      await loadChromiumResources();
+    }
   }
-  assert_true(
-      typeof WebNFCTest !== 'undefined',
-      'WebNFC testing interface is not available.');
+  assert_implements( WebNFCTest, 'WebNFC testing interface is unavailable.');
   let NFCTest = new WebNFCTest();
   await NFCTest.initialize();
   return NFCTest;
@@ -154,10 +149,6 @@ function createUrlRecord(url, isAbsUrl) {
   return createRecord('url', url, test_record_id);
 }
 
-function createNDEFWriteOptions(ignoreRead) {
-  return {ignoreRead};
-}
-
 // Compares NDEFMessageSource that was provided to the API
 // (e.g. NDEFWriter.write), and NDEFMessage that was received by the
 // mock NFC service.
diff --git a/tests/wpt/web-platform-tests/web-share/disabled-by-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/web-share/disabled-by-feature-policy.https.sub.html
index 9c189323299..6fc49fa4d97 100644
--- a/tests/wpt/web-platform-tests/web-share/disabled-by-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/web-share/disabled-by-feature-policy.https.sub.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <title>WebShare Test: Can be disabled by feature policy</title>
+    <link rel="help" href="https://w3c.github.io/web-share/#permissions-policy">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/resources/testdriver.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-share/feature-policy-listed.html b/tests/wpt/web-platform-tests/web-share/feature-policy-listed.html
new file mode 100644
index 00000000000..127498dde12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-share/feature-policy-listed.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: policy is listed</title>
+    <link rel="help" href="https://w3c.github.io/web-share/#permissions-policy">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      'use strict';
+
+      test(() => {
+        assert_true(document.featurePolicy.allowsFeature('web-share'));
+      }, 'allowsFeature() returns true for web-share');
+
+      test(() => {
+        assert_true(document.featurePolicy.features().includes('web-share'));
+      }, 'features() includes web-share');
+
+      test(() => {
+        assert_true(document.featurePolicy.allowedFeatures().includes('web-share'));
+      }, 'allowedFeatures() includes web-share');
+
+      test(() => {
+        assert_equals(Array.from(document.featurePolicy.getAllowlistForFeature('web-share')).length, 1);
+      }, 'allowsFeature() returns a single entry for web-share');
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html b/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html
index 4b4ecd560c6..301469f83d8 100644
--- a/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-consume-activation.https.html
@@ -3,9 +3,9 @@
   <head>
     <meta charset="utf-8" />
     <title>WebShare Test: consume user activation</title>
+    <link rel="help" href="https://w3c.github.io/web-share/#share-method">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
     <script src="/resources/testdriver.js"></script>
     <script src="/resources/testdriver-vendor.js"></script>
   </head>
diff --git a/tests/wpt/web-platform-tests/web-share/share-empty.https.html b/tests/wpt/web-platform-tests/web-share/share-empty.https.html
index c8fbb8ad451..23c2ddbf778 100644
--- a/tests/wpt/web-platform-tests/web-share/share-empty.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-empty.https.html
@@ -3,9 +3,9 @@
   <head>
     <meta charset="utf-8" />
     <title>WebShare Test: Share no known fields</title>
+    <link rel="help" href="https://w3c.github.io/web-share/#share-method">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
     <script src="/resources/testdriver.js"></script>
     <script src="/resources/testdriver-vendor.js"></script>
   </head>
diff --git a/tests/wpt/web-platform-tests/web-share/share-securecontext.http.html b/tests/wpt/web-platform-tests/web-share/share-securecontext.http.html
index 8139c411e12..6344330c6b4 100644
--- a/tests/wpt/web-platform-tests/web-share/share-securecontext.http.html
+++ b/tests/wpt/web-platform-tests/web-share/share-securecontext.http.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title>WebShare Test: Share from non-secure context</title>
+    <link rel="help" href="https://w3c.github.io/web-share/#extensions-to-the-navigator-interface">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html b/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html
index 5eae8e89426..d7ffd3b11ce 100644
--- a/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-url-invalid.https.html
@@ -11,15 +11,60 @@
   <body>
     <script>
       promise_test(async t => {
-        const url = "http://example.com:65536";
-        await test_driver.bless(
-          "web share",
-          () => {
-            return promise_rejects_js(t, TypeError, navigator.share({ url }));
-          },
-          "share with an invalid URL"
-        );
+        await test_driver.bless();
+        const promise = navigator.share({ url: "http://a.com:65536" });
+        return promise_rejects_js(t, TypeError, promise);
       }, "share() rejects when URL is invalid");
+
+      promise_test(async t => {
+        await test_driver.bless();
+        const promise = navigator.share({ url: "file:///etc/passwd" });
+        return promise_rejects_js(t, TypeError, promise);
+      }, "share() rejects file:// URLs");
+
+      promise_test(async t => {
+        await test_driver.bless();
+        const promise = navigator.share({ url: "wss://a.com/" });
+        return promise_rejects_js(t, TypeError, promise);
+      }, "share() rejects wss: URLs");
+
+      promise_test(async t => {
+        await test_driver.bless();
+        const promise = navigator.share({ url: "about:config" });
+        return promise_rejects_js(t, TypeError, promise);
+      }, "share() rejects about: URLs");
+
+      promise_test(async t => {
+        await test_driver.bless();
+        const promise = navigator.share({ url: "chrome://about" });
+        return promise_rejects_js(t, TypeError, promise);
+      }, "share() rejects chrome: URLs");
+
+      promise_test(async t => {
+        await test_driver.bless();
+        const file = new File([], "text/plain");
+        const promise = navigator.share({ url: URL.createObjectURL(file) });
+        return promise_rejects_js(t, TypeError, promise);
+      }, "share() rejects blob: URLs");
+
+      promise_test(async t => {
+        const encoder = new TextEncoder();
+        const encoded = encoder.encode(
+          `<meta http-equiv="refresh" content="1;url=http://example.com/">`
+        );
+        const file = new File(encoded, "text/html");
+        const url = URL.createObjectURL(file);
+        const reader = new FileReader();
+        reader.readAsDataURL(file);
+        const dataURL = await new Promise(resolve => {
+          reader.addEventListener("load", () => {
+            resolve(reader.result);
+          });
+        });
+        await test_driver.bless();
+        const promise = navigator.share({ url: dataURL });
+        return promise_rejects_js(t, TypeError, promise);
+      }, "share() rejects data: URLs");
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html
new file mode 100644
index 00000000000..75f4aa4020d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioworklet-interface/extended-audioworkletnode-with-parameters.https.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<title>Test AudioWorkletNode subclass with parameters</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+class Extended extends AudioWorkletNode {}
+
+const modulePath = 'processors/gain-processor.js';
+
+promise_test(async () => {
+  const context = new AudioContext();
+  await context.audioWorklet.addModule(modulePath);
+  const node = new Extended(context, 'gain');
+  assert_equals(Object.getPrototypeOf(node), Extended.prototype);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html
new file mode 100644
index 00000000000..6277c253ec0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-delaynode-interface/delay-test.html
@@ -0,0 +1,61 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Test DelayNode Delay</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+
+  <body>
+    <script>
+      let audit = Audit.createTaskRunner();
+
+      audit.define(
+          {label: 'test0', description: 'Test delay of 3 frames'},
+          async (task, should) => {
+            // Only need a few outputs samples.  The sample rate is arbitrary.
+            const context =
+                new OfflineAudioContext(1, RENDER_QUANTUM_FRAMES, 8192);
+            let src;
+            let delay;
+
+            should(
+                () => {
+                  src = new ConstantSourceNode(context);
+                  delay = new DelayNode(context);
+                },
+                'Creating ConstantSourceNode(context) and DelayNode(context)')
+                .notThrow();
+
+            // The number of frames to delay for the DelayNode.  Should be a
+            // whole number, but is otherwise arbitrary.
+            const delayFrames = 3;
+
+            should(() => {
+              delay.delayTime.value = delayFrames / context.sampleRate;
+            }, `Setting delayTime to ${delayFrames} frames`).notThrow();
+
+            src.connect(delay).connect(context.destination);
+
+            src.start();
+
+            let buffer = await context.startRendering();
+            let output = buffer.getChannelData(0);
+
+            // Verify output was delayed the correct number of frames.
+            should(output.slice(0, delayFrames), `output[0:${delayFrames - 1}]`)
+                .beConstantValueOf(0);
+            should(
+                output.slice(delayFrames),
+                `output[${delayFrames}:${output.length - 1}]`)
+                .beConstantValueOf(1);
+
+            task.done();
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html
new file mode 100644
index 00000000000..28c28bc1db5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-oscillatornode-interface/detune-overflow.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Test Osc.detune Overflow</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+  </head>
+
+  <body>
+    <script>
+      const sampleRate = 44100;
+      const renderLengthFrames = RENDER_QUANTUM_FRAMES;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('detune overflow', async (task, should) => {
+        let context =
+            new OfflineAudioContext(1, renderLengthFrames, sampleRate);
+
+        // This value of frequency and detune results in a computed frequency of
+        // 440*2^(153600/1200) = 1.497e41.  The frequency needs to be clamped to
+        // Nyquist.  But a sine wave at Nyquist frequency is all zeroes.  Verify
+        // the output is 0.
+        let osc = new OscillatorNode(context, {frequency: 440, detune: 153600});
+
+        osc.connect(context.destination);
+
+        let buffer = await context.startRendering();
+        let output = buffer.getChannelData(0);
+        should(output, 'Osc freq and detune outside nominal range')
+            .beConstantValueOf(0);
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webcodecs/audio-decoder.html b/tests/wpt/web-platform-tests/webcodecs/audio-decoder.html
new file mode 100644
index 00000000000..e6bc81d35cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/audio-decoder.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+<title>Test the AudioDecoder API.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/webcodecs/utils.js"></script>
+<script>
+
+const defaultConfig = {
+  codec: "opus",
+  sampleRate: 48000,
+  numberOfChannels: 2
+};
+
+function getFakeChunk() {
+  return new EncodedAudioChunk({
+    type:'key',
+    timestamp:0,
+    data:Uint8Array.of(0)
+  });
+}
+
+promise_test(t => {
+  // AudioDecoderInit lacks required fields.
+  assert_throws_js(TypeError, () => { new AudioDecoder({}); });
+
+  // AudioDecoderInit has required fields.
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  assert_equals(decoder.state, "unconfigured");
+  decoder.close();
+
+  return endAfterEventLoopTurn();
+}, 'Test AudioDecoder construction');
+
+promise_test(t => {
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  let badCodecsList = [
+    '',                         // Empty codec
+    'bogus',                    // Non exsitent codec
+    'vp8',                      // Video codec
+    'audio/webm; codecs="opus"' // Codec with mime type
+  ]
+
+  testConfigurations(decoder, defaultConfig, badCodecsList);
+
+  return endAfterEventLoopTurn();
+}, 'Test AudioDecoder.configure()');
+
+promise_test(t => {
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  return testClosedCodec(t, decoder, defaultConfig, getFakeChunk());
+}, 'Verify closed AudioDecoder operations');
+
+promise_test(t => {
+  let decoder = new AudioDecoder(getDefaultCodecInit(t));
+
+  return testUnconfiguredCodec(t, decoder, getFakeChunk());
+}, 'Verify unconfigured AudioDecoder operations');
+
+
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/webcodecs/h264.mp4 b/tests/wpt/web-platform-tests/webcodecs/h264.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..e21fcba32c125fba820ffa2269013c612d2b78fc
GIT binary patch
literal 7637
zcmaiZ2UL?ww{`*uNEf8H&;=<8y@if|f;0g|A%-LnAV5e$lPV%zP|+wzQBk@eQlv^#
zdar^Y0#c=jN*B0qJm=hd?sxyS{#k2g@7d+qvuDo));k~&2;xc#!n+fFyg(o-5QPF=
z5$TVDdEu2|AP|V&m4Ly3KzuA-Xe0@+DW*Mfd|WVTyj;I9Zu*ui`w=oOw!RUlsHzN+
zgP?o}7zj*71wv5NfT=;CNOfhjhB}}yl?MzIEUb)8<dh-$_J)8Z8iN89hCcWp9LALd
zQG`O3<P@PWiZzx*!fPrh1Ox=g`@5qtJ~*Veybr-mff7X?OY*`2Ha>WgyN@?f6M{mz
zAW?7_gn)5{D?!j07n~2u6AsgaYC<7MZzL{=h=D@`l{BG&Fqjg=3j@bu0wF{{7l2cP
z;E6$iD=;DmXgEwB3OE4+#LGPpgGNvgVSopMfb@35z+tKo6qexQg+u_ZFbIi&!QtGA
z0H+?Pjz*CH2IcDohXPALqHp+kW8jJ~Sr`oBiX@T{c%r8}o?`JAfG-~5<LXMpkl=EP
z5E7OEco2cr;Cy^Mkyv1Y_(ukV5OMA(U@iX$pb&4upBN~2FC>Yw4tH-7hJZr?Mu6M}
z=SM&WAy7VEcq9p!qkt_U5s>cQ00dx2KvHa62}myt5!fsj1U?Ah-O+GGfJdT{cuE#7
z2p4xGkrKq6fccYG0LI-7OL75pK6s2b!p#Q{X#W!80as5<5P%I=RDu4@BD~za;V>wK
zh{AYdP<|x1GL*7R0+O<&1Pl=ixD!x_|4x^pC!pXcf-A(!1=v?gTEGOZs3Z@C_)?OA
zL*-Qg7Eb~GLy>`SRSiHuBw_GyWr#Z-C=zfWfEof=NME4-lxl(^Kp>_~Ol%bB)bY_y
ztgvF2PrApLc@*e=0_*R2E#@O9)eqcZFU~i7uk+cni+?WfceJ^Yb0`WqQQhZz=6<K$
zP{#)2X*M+LPlE?&{|)r)<yW^71s-oC)%9Dbi)`k)<`{rVu=@k`&dH}Yy_3G?zrv(a
zt0s@8Pw>j-_2xPMnpqRg*OwceFi7LlBYt4HD(^Btr6?KtEL-Qz3}==z^@LfIV1Sq_
zZqYhqlF8^gSSxcRBez5*Sl%Ln$#-WbWw9ba@A~-(53|sYo$5n>-A`jI52`!jX}iC$
zo6WWtXccjwpG;O9&B;1@YLAm6GF9tPZw;tcFKL0}#`a)!p23-x<EP|)PLeZFpoX&!
zZN?g-QxW<7sI&aiwMsmS^g7NgHW8mY?GMa(xS@O;;(3P1(xT@o^X+P)(LIlB1MYZT
zJApM>VhlB)ev(oB`6lz#B#UJkaW;Xmkst4^`yM(+yXZZN>0^)49nzd-)p(tzB9TLC
z(kyu#JJuBTrpj<xA^65QiJMulPq(uje(A1x_D(w3Ke|iY?pQP479i{>t}SGSocAQF
zjrUcRJ^r+@>=?U8S63XkFLdkT19@2^W}Y=`nbARX&I#(T4}#q+RHwAtMxYO=tqOA&
zVB~p;<Jyn>EOVdY6u!R89vb>Vc3)c_R$eVSxy=kof1`hADGX8Lc_~nWtL6r~8NEr3
zr5>`NXu_Rc?AhB``?H(F%d}4h6^m9TONg?vSD9<aJIqAU@{Gt&t_r#{Z9Ddwcjd3p
zB4Wm3w&5-p=DDAer;)+AtJlG@><e}^t*s|R<)kwuUF4ae(N`0jE9}O88(BC|LkmN4
zpMk#%jipImYob1y93mRt72-RuWpadfdw?=IMantlguYPNFWPFVJ_Op`8@-Wg)I5q3
zcyLKas-eDi#Q4|kx6WKJ#d9o!CVnpnU@IMEvAeTNU$eEYy;y6@7-CiRNQa&;<w(=#
z(w~d{-A(m7<>!m=y1i3XuA@qwpGp-TFtLUzS};`<n!!BDgRM7NlJ9gfsl7^P>%gGE
zI=u*kD&xmbpQR=a=Ke~K7;vJ&%a3C(TI<K?8rB^+xw1_;lV48vpP23K{&CePVbeJ5
zCu*xt5hnIInBKAGAsvF_iXguLJ>5bhcQ9x}>I(RYIwLdJHQ9<8iIb1iZ3bG>F0LPU
z+3-brcJEtUgGsV~xa<~46PZIOpA2VLUUCr0C~ZGoI%}~a_flQPpv|R$R$0DO8$&k|
zri*RPFloP&TqPXUB|)57tUZ+Ljn8I2PN?pqaWP3<jYrsw#EmBLx7%x`?><22<ZHz0
z)LUp<O5VoQaC2#15o}*h{vcU9&-<=)t?xBEn5m__81C9tf5DP8uCm1KAIfhQ=nsEF
z#dC?js83&RJfzTYcRxqOe5%x>HInnUAzP;f?7+z9jCIWm;Tf0PIL{na1>2$b&xY)Y
zs%I}x7%P+y(Fsw7glI@IHk<2xh;V{LkDFZB%MKo?%l-1ZR%Y|;k3mN}UoFw(<M_e!
zM=Q5Z?gxeKrv%qXPl!36<jEI$|Ah<oP_7Zx!tWnc>BJ;uJH%|Y1`_6(V&xdTpVe25
z#kacAC#r~aD3&#6Unz{z#!~eibg`^9*VMoz#G*&eg$h6R@v@k>cmL*v?$|G^{wGdZ
z*z%?^wQCh$dbAet(qO!;1<NAjk_|sTNYe1nJ*<Dp^dg2d_Tfdt{5j(0?&)B+oyKd2
zSe54?p|KKQF9?Qz@ksKB3W}IBQ1)16&0*Cyy&-v!d-b+;>O1>PyjSho&-=n7n&u+W
zim7UBw=rahmuu^S;qx<_lha%EU5~jQWe-1GBtLZJNgd?HB7%-}^M+cF8mlrbO72?c
z2X#+v>K-%nT1~r09}LK!^V_HCok|?BANO<>`?+<ma6PyCrrgg*17{9i1xFb;&Iwah
z@?`oMUR=*)tLF%GiB>x79#C`fH=u=aXiL&v-5n(AWnObK|FR_aP!yaqd<s5pcE<hO
z9afj>8*qgaBh`mAHg)H@L+n_rSf$q%*j*x9rR{m$o~ZAL*gw^Q7RsfCz1|4Cqc@fO
zZPbX~CatZnq)V-xVMj@<a;77<LLzl`?L;NLW5xKWf(2DKmWeA41Y58y+}R#>jmwef
zrlJ!NfNQ-<f4AG@-(O~xl_H@Udzj1lkbR=&yO>>;ZOmhyR$NEkWhaxaix)UQb&>0D
z-G$MZ)p&GQS8kiZ)r(YTG+%h8B7Hr~DxQsvp2aG*tkSAKW$fd@3$~WM+Gco?Ay8xA
zTy;|RgX)6uZk>PeqRP36UfIf+E6*54cMUC=-M&5ViHn-JC)CXF-ulYxA(fo2nkw_f
z!24r)0h2eMfu4Y6Yszi?JnR#X!|j=3qNDAP{N6`h@aaUG9MRUW51tmxXvqxNkyUgZ
zv*D)F)yt@Gu{+zbxHdW`G+dQKua$c~_P`DY#<cp!NR{l4*;TIDn&FkVA`2bD+{RyN
z6<f4I6d}%GUiQ!YGkO9CWU)OoAHZErr>59OlzAftyAanNmx(d$EJ#QjFvCNM6Xyz*
z3(+T=>>a}dE!nR<9TC=0I+=NfS)=DLY{JFt!?mi$p*(RYQ@Z7Es`A01(BZ;3{+bbj
z$OZG9_G`QgUT>qyR+*y;?PFgBYTczR8g%2BX{|io_BElkxN(m?i%i^oqo=Q}XKPs&
z+CJ;Zaza(f`*!d<P+&dPIjRPY`nMC91s`D{ZRYXne$#s)tUQKu4D1IUmm0VCvY)lL
zn$;A%p4t1cgL`jii(WZfC-E*}cQqz2y__`F`!jUY!|iO>yC3>RdjxgI@#SO7E=#b*
zyWH?yIzCMu<#K&X(^I`valMnxhM&9_BNbCplx$;Ks=OnrW(?Zu#P1hmjBuVi-Sg-@
zOfrR+Yx~7b4?Op=VrH)OJd|^mZ??g5<Sydfnx(gRKkH5MoKFIdf5d8#zfAQtlZ@s%
zYGR{}g@pGjRE=Kz0{f*$=h#1=+JEXJbYCPpAk+Al)DI`kvYw2~>~qGsx`^QFC!rDS
z+=ya(8klHTq&Rm-V~ND?4r4h1a<XQ^gIq)Lf%;!xK~!rmw?lQ~WQ=-{6;&!LNzB6T
z%l;l+KUYW0u09D}#V!_+s|+71n$I}ONbm+^N;z<lYnN4=w8uN^xqqv&sC~_wRMvgc
zeVXY?lt#pzX-M0RPdztY*E3w&a*P-C9n1_Uyz~TamoSxVwA}3H##bD#(N!EBtUc4D
zwryVMTz`)%GE(_U^1dRLcz?|F>@TI0WVYuKqrTKdqZO8uE-`X7OPdpwo41@YalX)N
z)-K``&)9-rCJ9tIR1T@Fr@vl}9f!R+Vaw>G6B3Z9GlOA6ed;b}OZ4NY#xUYQp(p5W
z8Ol#xw@>+q?(1n~9n~%nW!ou>^X28khipq(c6QViscJS|63memYe$#83)mjI-@K4G
z=nd8>o6TJMIGa|1&|(YfOfPTx&bBsii-83nKQ?vw_^qROwat3dTxw7EQkh?ssi(uG
z8Y9I%NOSlr?k9&2+=B}6%Jjt<31OjzJP^K&l^8KNzVCi`>$+e8)0vMI%*a;{Lwd{V
zrAJQ_b3wdVw#5kU?;M(lCaZjN!-PAV;RLIY5M79w(?RsKLqo0xlR~+}v|sVvB>l-B
zJ05K7c_$C6Uesw>^EV}#xhPGQsQ5RQM=`!Zl!T@@?Tsz7n!0JHm0vaAnGxjhVjDin
zcaWR<@|}8z6D9LHFZuAN2;;nNn_l+&%kEO-Hr%<d@=7-A;mM}-n;#Rkb;sVSDixkg
z^9vi_%;D^;>{BP6i1;X$fYB)X70Xm(xkY;(MqqwA&$S1OT-A+Ex0<_{GG0PzuU9{O
zZjNwpHZz=W+9G|+W|&M~yt<7Zy1DAtFK$eB5pqttMBPZTU3hX8zat~3t2`x=bBz2o
zZ$-oMN#EpJ=+QY>mD->uh>2<I*x`((1Dima9+qn<&<8b*Iu1SjskW6@T$N>vU+;eL
z2rd;oZ7A>GR?IhF4>AFZPi3vtGrp{VbskaOPE2_7Zr4+v-||#}ctJn@mvwxHe&DUi
zu<38Z{>pmWGVN&}#m3kyH8_Hjcl@Yi=5AV=hDg1RgLA&^6CZu^zVdD)-L^elY5K(+
ziHBz}zix+qXt}F21a{mRVR5^5r!0$(!*f1-G2mWPue>=!Mxwk|LQ2;2<5n3DNi{JI
zqW=KH#lzYjYrB4dyY7OjK3NNqH(RL>DiXAUZ^PwQ(p2!4GxkhD2<VKAjc3yGi|EC}
zW`)Q#JIo7Z*IQi0>n8-X9E+w!(ty7d>XnF%{21Tk5oqYJcQ)$*?E`_J{z5o&Ie7v{
z->eaT$5yq`O1P&Hx+<T@Jjk-328#4KzAvcFWzEZeXRpy@{%LDjrCt?kCs7cAcxH(k
zC@A~!h>c?p1fovUPZP)KvmO=Lf!a6GdQ`$E*PSk$e=wF<2jM&Iw>u=gNY34o%;*uG
z6eyWx^Om_cX7$CooS{}p!}9v4RJZ9wUgNuRE=uIYna>k9M;%9l@}=ueg>}3UGM3tD
zG*yb;vuVsbtK=-1|FQuYO<NXgB;szIqEecHR~f5(nW-8-&2jnXe%TH8Me{os`Tf82
zJyioOh(C0S^VBQ~A{mKf2|Rl)DQu`D#T7JVfQ@`^TkfQL7Jc#Hg8M9f*QbiEENX5&
zCPBqe!7dXoA=&6J=#FN*vt&{=mc<m5v$$eee|PD=eAU?AobG<?HLDquR_+?K>&?&}
zYKV+FpNK3bOSJUrN{W<FXJq}ADl6J*gZ9x^FTLJa)k+;^6t!zi$bCQSdiiqo`gTb}
zi^j6<%g@8rmEVj8vNby=lX2m{Lq*;TCA96c&`q{byPpkg`NF+@261B{KU;4B8aX{%
zFMTU3Y`!-u(o!sc(XgO&KFyk(u=O6E?VE2lH1VZ{4u?W=O~G+V-^(fwNwYRC@0L{D
zOV_)S2GXY6Q|yhb_;Wo^Oe`vIRByuaZ;kHcHrZtV?nx=YI`$5F-}P~>4L#(%+?RDn
zK2w-4K<3E0@uGD2%XEI4+>47xZt2B5Cg$Xq-|{}`{kVfKMs^{yQx@%G^)`a+IrC)=
zML$7%&|KD3BD_8MjJ|2EsV*_pdGv*FJ89{SdUNRWw_dNdKXVIL8n(?w$g6*|_^QpQ
zx&*WK8QD5$e<tD4AS?Hy!niYF>E3cHQsIWWlCOf(1!HF33F;B{llRuFu=Sl!Q&17%
zswls_{xj&HN^yKYp9uM0ZbDrOR%&)${mu+e6w=S*0_aqHyM|R6H`kGSBkj#c_>*5x
z(7J7sJ8Fb+-p?1u?cUA5{c^@);z)OPsug;~QF$z*9zms<vJ$&=A~M=<fThRmVGP%F
zAu7p_Kbv5%ZRq0Uc(`M$JKiM}IMrc-dLj_YE8>Or?b&;7aN`B%5@^V!PV$8UL{Uun
z0zy;gaPV=1PFHHh{H@TRrXL(6AY3Ym*^UOioyrcvqnHx`xY(3X-Mo+VPx`kPXFrs)
zy?6dCdCTKLXZ3U(_~>0o#Z=Nf`X^`5w~ITMZIA<#wmvMGMdt|-C8iARfsLl;T6nKK
z#XE3u=NepWIk(QW5x#?tmRLWGhr=@X%D}lF5|zoW#>c0Z*+(79x10T}yJ%~U;^NE7
z;=S_iCxDM?Yx<c6fidBrJeimno5Jy}i+YDJ(W?8`snFTFhetG-z8B+0oN1hlv_-#X
zZf6`So;P#A(%m(g_@W=5v1&-q98Be3Rn?3)v&}g+1Q%Rp5Ke#Eut;{&$;Yl1WQV+(
zB64Ak6H=2Nf^S+p3LSpU?}qhl^33iaL~-LjPY2UyJt~#1?|zU!J6TVHZN&tQjph4g
zw<$O39fe7$bhDYoCiQVfl{eRcUSMVG#i36Hi`9*6zkd``Awhj>MzfdU%~6)Ap;3tT
z@fXcjw%f>)i+nx)H+<sjK3UQ}aHbY4|9;*eQzQaci%*zn7-<3$b^>Q2NrvH|_1fhM
zGE{fs=rsxM7ed&J77a70)0~g}9X@h}Xe9gDq2<?>p&5F38pr2w+T&H$FLxfeuHm<{
zp$QA;U&rIGb|`GD)ym10jE1$ByxGd%Qtp`tK4<^|oWYqW4<LY8#S)$7_-M61Q+k^x
zghu+-+nv4p3@PR(r0!^5*L4!*VSju@>wDpM&5aU96C)8)c3&ggm$$#lhc{!Tg9hcW
zj*Oj3eEruZ;KVngA{KjhR>(5Lt;T}Dhfkb-8rCdNADe1UA8>q>PX@splpPrC8~FQe
z->3bc_4=VPdLKzn?%C%&-tPy8%#ELY5*uw_Ke_)}Er>%^B2=@dC3A|e0W9ODG`<&M
z-6<&ZEDj>k_X|Naa?AJ{+WA%Lp!;#9O`L(Y!dyh9HLc`|mzH&#iq?P%8>BUHW)B&#
zaA9`l$~P^ccJoVCmu@HCFBmQ^j<1uRJuK3#>X4eT34HZ&Jvu$sj5hWp*;|j@ruJQ6
zE33UW)duQT-DO=mua1)qWCHW2`MPf?<uh%PB-#|~U9f+XhKLNqxn6|uLdJ)_zBbLQ
zyjBL+-GR+LeKoQ_hz_q;6exu&4dGo1Gc{=cK{Pz%YNFZ>X#ajR?DpF>UxF>cfJ4n?
zmPP7D-FHQf^s}0T^|h_XV{D*z?Qgl~FJqj(eXkjnyI&}Fo<P$Xqv$06m7K4`K#-*p
zR&V5@4rnW%2-}~;*%}7F$p02m2)z)p5`F(C_PoWVJ40uFe4YLj^5nbA(zDO%7ds}I
z6$BY-f*naKT&1svA+qn*rD-Z^LrpKi_Zy{ZD)*=uS;EhG4}K4jbL%b`Sr<Ko^Kpwb
zY8!^GqaUx3Z^6Ir#!6?sw)BaQ^zIyeojoEQLU?;hmjCVP2U@lA-QmgC7>5JJ1%!(8
zo7UL1MEy-CqHajC5|mn8`&%~bR!%<k%V95-veU29m5+aK-H8h>>Q_q%Rc+KMSCuLI
ztZb6s7qYPiHDDa#*?eX(C-!A_;N>LhJtY5um|lHgO!voEA41c5v8VISe6&<p6JaVJ
z^>fM+2#kq)7OZ%D<(XEMlS!X+iRU4`bphspa%C#?Goy`9$!Z;gcx`lHqFBg@tOV}g
zuT{1e-iEFuch5&|8%K^-udOe~e|ap}ag6QvO5mBRx>4+S_PR@_MA*&)JAWBHx1v>S
z5$YHGI!O-vi9K60)xWkzQYWU)PTU$%!-O$8y}=dfEO6=fnG3fqK`k1bdp%7($g???
z+Q@+w*Dx~lS=T~TZ10rKmlCjg#NjO0fx#=%S05Qyp~>x}4YlqoV?SnJW)KaT6GCrX
zHGkTTR09_72+n*-x$9yjMI)EdJIslNA9+<ls=4=t8@lgaN)yx>(ms#KUHD2ZL!%m6
zejD{J{IlAYg}?FB>-#<L8y@AgtZtbO8#S?CFmd*LpZYw7re*cQab>qUg!>eL?hek(
z{p+HyNeyh6zXs>Q8z{ILAEXR8TRpKY`|+B?c?FrU7f^E}`iIAiAt+P9qteN<jo{uY
z)qKQbj+Wb{h0w^~h9UhLb*NN%8}i$$=}ngSm{W|^B~`d$vG62o9I=?w3Iqak>Zj!c
zcOD1ad7tB>+$fM}p?evppAE?1u~v9^DkNVed@K%j`QG&AX%4T^HT>)hopDK!=xBeA
zUqIJ~Zy{bnO!?wNnwJtbt*4gM5cgxYWHV9Q@aYoRr7;KbUqP(L?3bPjWxmCH#7J1z
zkCy4ISTM87cNlwKb@LD0Tc9^Nty$qaq@wFH8K?|v8wxHD6A+I}Fpi|P#q<drCH}4t
z&){K?yg7NbfO=tTy!*`Ok}>B;pPj(^pC!n{I%?AgFa1njw0|A*ImcIHNi$b>wN^It
zc2kY_)T^J1VQpzqSv0O%1(|eTr*Hy7Nj0qjImutENts)tJ=OVc7DX4b*#&%^17c|1
z6F9NoYVpLL(qp6M{ma0=mswsuKK?*8a9;jcG(i8=sFwi!5(o@z-@l~)djcr_ml6ch
z`?u}?<*9%l;11vc!4ptjBYFObN&PRgztJeM|D*j!oc~u`upZ#^{g0nG22COYoB#$#
z1YW!TGys8uOaJ$psr0?j?npob@k0M+?q>k;8IaxkKYnspG>-6x0|v@F);~Oj+Ed=O
zOp)Gb9EM^8UIkt@Tmj~^zt<noe=l1c{g+Mv4LqMvoPkEsGx-s4kiU3v5s~DA19*TE
z|0xK?CY|z>2T)4;H|AdgJs@pUfTeUw`#%<ciT^e793KNSRRGlxj0Q0s&wzN{09rJz
zuYUk$19l2T8Nhm*2C3J<AX@CVxh~Ph!`)p91REYn!~>KPh0=M5q(7Stuz%(ZAP^0O
zKMmwSDFUVaV|yL-Kem7!MGh3?4?X=i{bx>@QuKeY0Q&#a|M3$5Vxs<d{!h%m<AAgQ
z-HpF>6avUubAc=~0e%zcNT9m_2b7XqHPD@b4m_uVc>xOKg7N_<r2%UJL4oe#hbB>c
z9KA4qD8Pb5{(V@014cmN@sxW0cawAf>qJWAlYA(Eg1~bu1%v_$GDrHms;J8=tH{Hk
G(EkEmMe~>d

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/webcodecs/utils.js b/tests/wpt/web-platform-tests/webcodecs/utils.js
new file mode 100644
index 00000000000..940c2c28b96
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/utils.js
@@ -0,0 +1,126 @@
+function makeImageBitmap(width, height) {
+  let canvas = new OffscreenCanvas(width, height);
+
+  let ctx = canvas.getContext('2d');
+  ctx.fillStyle = 'rgba(50, 100, 150, 255)';
+  ctx.fillRect(0, 0, width, height);
+
+  return canvas.transferToImageBitmap();
+}
+
+// Gives a chance to pending output and error callbacks to complete before
+// resolving.
+function endAfterEventLoopTurn() {
+  return new Promise(resolve => step_timeout(resolve, 0));
+}
+
+// Returns a codec initialization with callbacks that expected to not be called.
+function getDefaultCodecInit(test) {
+  return {
+    output: test.unreached_func("unexpected output"),
+    error: test.unreached_func("unexpected error"),
+  }
+}
+
+// Checks that codec can be configured, reset, reconfigured, and that incomplete
+// or invalid configs throw errors immediately.
+function testConfigurations(codec, validCondig, invalidCodecs) {
+  assert_equals(codec.state, "unconfigured");
+
+  const requiredConfigPairs = validCondig;
+  let incrementalConfig = {};
+
+  for (let key in requiredConfigPairs) {
+    // Configure should fail while required keys are missing.
+    assert_throws_js(TypeError, () => { codec.configure(incrementalConfig); });
+    incrementalConfig[key] = requiredConfigPairs[key];
+    assert_equals(codec.state, "unconfigured");
+  }
+
+  // Configure should pass once incrementalConfig meets all requirements.
+  codec.configure(incrementalConfig);
+  assert_equals(codec.state, "configured");
+
+  // We should be able to reconfigure the codec.
+  codec.configure(incrementalConfig);
+  assert_equals(codec.state, "configured");
+
+  let config = incrementalConfig;
+
+  invalidCodecs.forEach(badCodec => {
+    // Invalid codecs should fail.
+    config.codec = badCodec;
+    assert_throws_js(TypeError, () => { codec.configure(config); }, badCodec);
+  })
+
+  // The failed configures should not affect the current config.
+  assert_equals(codec.state, "configured");
+
+  // Test we can configure after a reset.
+  codec.reset()
+  assert_equals(codec.state, "unconfigured");
+
+  codec.configure(validCondig);
+  assert_equals(codec.state, "configured");
+}
+
+// Performs an encode or decode with the provided input, depending on whether
+// the passed codec is an encoder or a decoder.
+function encodeOrDecodeShouldThrow(codec, input) {
+  // We are testing encode/decode on codecs in invalid states.
+  assert_not_equals(codec.state, "configured");
+
+  if (codec.decode) {
+    assert_throws_dom("InvalidStateError",
+                      () => codec.decode(input),
+                      "decode");
+  } else if (codec.encode) {
+    // Encoders consume frames, so clone it to be safe.
+    assert_throws_dom("InvalidStateError",
+                  () => codec.encode(input.clone()),
+                  "encode");
+
+  } else {
+    assert_unreached("Codec should have encode or decode function");
+  }
+}
+
+// Makes sure that we cannot close, configure, reset, flush, decode or encode a
+// closed codec.
+function testClosedCodec(test, codec, validconfig, codecInput) {
+  assert_equals(codec.state, "unconfigured");
+
+  codec.close();
+  assert_equals(codec.state, "closed");
+
+  assert_throws_dom("InvalidStateError",
+                    () => codec.configure(validconfig),
+                    "configure");
+  assert_throws_dom("InvalidStateError",
+                    () => codec.reset(),
+                    "reset");
+  assert_throws_dom("InvalidStateError",
+                    () => codec.close(),
+                    "close");
+
+  encodeOrDecodeShouldThrow(codec, codecInput);
+
+  return promise_rejects_dom(test, 'InvalidStateError', codec.flush(), 'flush');
+}
+
+// Makes sure we cannot flush, encode or decode with an unconfigured coded, and
+// that reset is a valid no-op.
+function testUnconfiguredCodec(test, codec, codecInput) {
+  assert_equals(codec.state, "unconfigured");
+
+  // Configure() and Close() are valid operations that would transition us into
+  // a different state.
+
+  // Resetting an unconfigured encoder is a no-op.
+  codec.reset();
+  assert_equals(codec.state, "unconfigured");
+
+  encodeOrDecodeShouldThrow(codec, codecInput);
+
+  return promise_rejects_dom(test, 'InvalidStateError', codec.flush(), 'flush');
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-decoder.html b/tests/wpt/web-platform-tests/webcodecs/video-decoder.html
new file mode 100644
index 00000000000..33c478d0090
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/video-decoder.html
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html>
+<title>Test the VideoDecoder API.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/webcodecs/utils.js"></script>
+<script>
+'use strict';
+
+// TODO(sandersd): Move metadata into a helper library.
+// TODO(sandersd): Add H.264 idecode test once there is an API to query for
+// supported codecs.
+let h264 = {
+  async buffer() { return (await fetch('h264.mp4')).arrayBuffer(); },
+  codec: "avc1.64000c",
+  description: {offset: 7229, size: 46},
+  frames: [{offset: 48, size: 4007},
+           {offset: 4055, size: 926},
+           {offset: 4981, size: 241},
+           {offset: 5222, size: 97},
+           {offset: 5319, size: 98},
+           {offset: 5417, size: 624},
+           {offset: 6041, size: 185},
+           {offset: 6226, size: 94},
+           {offset: 6320, size: 109},
+           {offset: 6429, size: 281}]
+};
+
+let vp9 = {
+  async buffer() { return (await fetch('vp9.mp4')).arrayBuffer(); },
+  // TODO(sandersd): Verify that the file is actually level 1.
+  codec: "vp09.00.10.08",
+  frames: [{offset: 44, size: 3315},
+           {offset: 3359, size: 203},
+           {offset: 3562, size: 245},
+           {offset: 3807, size: 172},
+           {offset: 3979, size: 312},
+           {offset: 4291, size: 170},
+           {offset: 4461, size: 195},
+           {offset: 4656, size: 181},
+           {offset: 4837, size: 356},
+           {offset: 5193, size: 159}]
+};
+
+function view(buffer, {offset, size}) {
+  return new Uint8Array(buffer, offset, size);
+}
+
+function getFakeChunk() {
+  return new EncodedVideoChunk({
+    type:'key',
+    timestamp:0,
+    data:Uint8Array.of(0)
+  });
+}
+
+promise_test(t => {
+  // VideoDecoderInit lacks required fields.
+  assert_throws_js(TypeError, () => { new VideoDecoder({}); });
+
+  // VideoDecoderInit has required fields.
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  assert_equals(decoder.state, "unconfigured");
+
+  decoder.close();
+
+  return endAfterEventLoopTurn();
+}, 'Test VideoDecoder construction');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  let badCodecsList = [
+    '',                         // Empty codec
+    'bogus',                    // Non exsitent codec
+    'vorbis',                   // Audio codec
+    'vp9',                      // Ambiguous codec
+    'video/webm; codecs="vp9"'  // Codec with mime type
+  ]
+
+  testConfigurations(decoder, { codec: vp9.codec }, badCodecsList);
+
+  return endAfterEventLoopTurn();
+}, 'Test VideoDecoder.configure()');
+
+promise_test(async t => {
+  let buffer = await vp9.buffer();
+
+  let numOutputs = 0;
+  let decoder = new VideoDecoder({
+    output(frame) {
+      t.step(() => {
+        assert_equals(++numOutputs, 1, "outputs");
+        assert_equals(frame.cropWidth, 320, "cropWidth");
+        assert_equals(frame.cropHeight, 240, "cropHeight");
+        assert_equals(frame.timestamp, 0, "timestamp");
+        frame.destroy();
+      });
+    },
+    error(e) {
+      t.step(() => {
+        // TODO(sandersd): Change to 'throw e' once e is defined.
+        throw "decode error";
+      });
+    }
+  });
+
+  decoder.configure({codec: vp9.codec});
+
+  decoder.decode(new EncodedVideoChunk({
+    type:'key',
+    timestamp:0,
+    data: view(buffer, vp9.frames[0])
+  }));
+
+  await decoder.flush();
+
+  assert_equals(numOutputs, 1, "outputs");
+}, 'Decode VP9');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  return testClosedCodec(t, decoder, { codec: vp9.codec }, getFakeChunk());
+}, 'Verify closed VideoDecoder operations');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  return testUnconfiguredCodec(t, decoder, getFakeChunk());
+}, 'Verify unconfigured VideoDecoder operations');
+
+promise_test(t => {
+  let numErrors = 0;
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.error = _ => numErrors++;
+
+  let decoder = new VideoDecoder(codecInit);
+
+  decoder.configure({codec: vp9.codec});
+
+  let fakeChunk = getFakeChunk();
+  decoder.decode(fakeChunk);
+
+  return promise_rejects_exactly(t, undefined, decoder.flush()).then(
+      () => {
+        assert_equals(numErrors, 1, "errors");
+        assert_equals(decoder.state, "closed");
+      });
+}, 'Decode corrupt VP9 frame');
+
+promise_test(t => {
+  let numErrors = 0;
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.error = _ => numErrors++;
+
+  let decoder = new VideoDecoder(codecInit);
+
+  decoder.configure({codec: vp9.codec});
+
+  let fakeChunk = getFakeChunk();
+  decoder.decode(fakeChunk);
+
+  return promise_rejects_exactly(t, undefined, decoder.flush()).then(
+      () => {
+        assert_equals(numErrors, 1, "errors");
+        assert_equals(decoder.state, "closed");
+      });
+}, 'Decode empty VP9 frame');
+
+promise_test(t => {
+  let decoder = new VideoDecoder(getDefaultCodecInit(t));
+
+  decoder.configure({codec: vp9.codec});
+
+  let fakeChunk = getFakeChunk();
+  decoder.decode(fakeChunk);
+
+  // Create the flush promise before closing, as it is invalid to do so later.
+  let flushPromise = decoder.flush();
+
+  // This should synchronously reject the flush() promise.
+  decoder.close();
+
+  // TODO(sandersd): Wait for a bit in case there is a lingering output
+  // or error coming.
+  return promise_rejects_exactly(t, undefined, flushPromise);
+}, 'Close while decoding corrupt VP9 frame');
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-encoder.html b/tests/wpt/web-platform-tests/webcodecs/video-encoder.html
index ce03f058f78..20b01a93299 100644
--- a/tests/wpt/web-platform-tests/webcodecs/video-encoder.html
+++ b/tests/wpt/web-platform-tests/webcodecs/video-encoder.html
@@ -7,8 +7,16 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/media.js"></script>
+<script src="/webcodecs/utils.js"></script>
 <script>
 
+const defaultConfig = {
+  codec: 'vp8',
+  framerate: 25,
+  width: 640,
+  height: 480
+};
+
 async function generateBitmap(width, height) {
   return createImageBitmap(document.getElementById('frame_image'),
                                   { resizeWidth: width,
@@ -20,94 +28,47 @@ async function createVideoFrame(width, height, timestamp) {
   return new VideoFrame(bitmap, { timestamp: timestamp });
 }
 
-// Calls done after giving async output/error callbacks a final chance to run.
-async function asyncDone(test) {
-  test.step_timeout(test.done.bind(test), 0);
-}
-
-async_test(async (t) => {
+promise_test(t => {
   // VideoEncoderInit lacks required fields.
   assert_throws_js(TypeError, () => { new VideoEncoder({}); });
 
   // VideoEncoderInit has required fields.
-  let encoder = new VideoEncoder({
-    output(chunk) { assert_unreached("Unexpected output");  },
-    error(error) { assert_unreached("Unexpected error:" + error); },
-  });
+  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+  assert_equals(encoder.state, "unconfigured");
+
   encoder.close();
 
-  asyncDone(t);
+  return endAfterEventLoopTurn();
 }, 'Test VideoEncoder construction');
 
-async_test(async (t) => {
-  let encoder = new VideoEncoder({
-    output(chunk) { assert_unreached("Unexpected output");  },
-    error(error) { assert_unreached("Unexpected error:" + error); },
-  });
+promise_test(t => {
+  let encoder = new VideoEncoder(getDefaultCodecInit(t));
 
-  const requiredConfigPairs = {
-    codec: 'vp8',
-    framerate: 25,
-    width: 640,
-    height: 480
-  };
-  let incrementalConfig = {};
+  let badCodecsList = [
+    '',                         // Empty codec
+    'bogus',                    // Non exsitent codec
+    'vorbis',                   // Audio codec
+    'vp9',                      // Ambiguous codec
+    'video/webm; codecs="vp9"'  // Codec with mime type
+  ]
 
-  for (let key in requiredConfigPairs) {
-    // Configure  should fail while required keys are missing.
-    assert_throws_js(TypeError, () => { encoder.configure(incrementalConfig); });
-    incrementalConfig[key] = requiredConfigPairs[key];
-  }
+  testConfigurations(encoder, defaultConfig, badCodecsList);
 
-  // Configure should pass once incrementalConfig meets all requirements.
-  encoder.configure(incrementalConfig);
-
-  encoder.configure(incrementalConfig);
-
-  encoder.close();
-
-  asyncDone(t);
+  return endAfterEventLoopTurn();
 }, 'Test VideoEncoder.configure()');
 
-async_test(async (t) => {
-  let encoder = new VideoEncoder({
-    output(chunk) { assert_unreached("Unexpected output"); },
-    error(error) { assert_unreached("Unexpected error:" + error); },
-  });
-
-  let videoFrame = await createVideoFrame(640, 480, 0);
-
-  assert_throws_dom('InvalidStateError',
-                    () => { encoder.encode(videoFrame); },
-                    'first encode');
-
-  // Once more for good measure.
-  assert_throws_dom('InvalidStateError',
-                    () => { encoder.encode(videoFrame); },
-                    'second encode');
-
-  encoder.close();
-
-  asyncDone(t);
-}, 'Test encode() before configure() throws InvalidStateError.');
-
-async_test(async (t) => {
+promise_test(async t => {
   let output_chunks = [];
-  let encoder = new VideoEncoder({
-    output(chunk) { output_chunks.push(chunk); },
-    error(error) { assert_unreached("Unexpected error:" + error); },
-  });
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.output = chunk => output_chunks.push(chunk);
+
+  let encoder = new VideoEncoder(codecInit);
 
   // No encodes yet.
   assert_equals(encoder.encodeQueueSize, 0);
 
-  const config = {
-    codec: 'vp8',
-    framerate: 25,
-    width: 640,
-    height: 480
-  };
-  encoder.configure(config);
+  encoder.configure(defaultConfig);
 
   // Still no encodes.
   assert_equals(encoder.encodeQueueSize, 0);
@@ -115,8 +76,8 @@ async_test(async (t) => {
   let frame1 = await createVideoFrame(640, 480, 0);
   let frame2 = await createVideoFrame(640, 480, 33333);
 
-  encoder.encode(frame1);
-  encoder.encode(frame2);
+  encoder.encode(frame1.clone());
+  encoder.encode(frame2.clone());
 
   // Could be 0, 1, or 2. We can't guarantee this check runs before the UA has
   // processed the encodes.
@@ -130,10 +91,123 @@ async_test(async (t) => {
   assert_equals(output_chunks.length, 2);
   assert_equals(output_chunks[0].timestamp, frame1.timestamp);
   assert_equals(output_chunks[1].timestamp, frame2.timestamp);
+}, 'Test successful configure(), encode(), and flush()');
+
+promise_test(async t => {
+  let output_chunks = [];
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.output = chunk => output_chunks.push(chunk);
+
+  let encoder = new VideoEncoder(codecInit);
+
+  // No encodes yet.
+  assert_equals(encoder.encodeQueueSize, 0);
+
+  let config = defaultConfig;
+
+  encoder.configure(config);
+
+  let frame1 = await createVideoFrame(640, 480, 0);
+  let frame2 = await createVideoFrame(640, 480, 33333);
+
+  encoder.encode(frame1.clone());
+  encoder.configure(config);
+
+  encoder.encode(frame2.clone());
+
+  await encoder.flush();
+
+  // We can guarantee that all encodes are processed after a flush.
+  assert_equals(encoder.encodeQueueSize, 0);
+
+  // The first frame may have been dropped when reconfiguring.
+  // This shouldn't happen, and should be fixed/called out in the spec, but
+  // this is preptively added to prevent flakiness.
+  // TODO: Remove these checks when implementations handle this correctly.
+  assert_true(output_chunks.length == 1 || output_chunks.length == 2);
+
+  if (output_chunks.length == 1) {
+    // If we only have one chunk frame, make sure we droped the frame that was
+    // in flight when we reconfigured.
+    assert_equals(output_chunks[0].timestamp, frame2.timestamp);
+  } else {
+    assert_equals(output_chunks[0].timestamp, frame1.timestamp);
+    assert_equals(output_chunks[1].timestamp, frame2.timestamp);
+  }
+
+  output_chunks = [];
+
+  let frame3 = await createVideoFrame(640, 480, 66666);
+  let frame4 = await createVideoFrame(640, 480, 100000);
+
+  encoder.encode(frame3.clone());
+
+  // Verify that a failed call to configure does not change the encoder's state.
+  let badConfig = {...defaultConfig};
+  badConfig.codec = 'bogus';
+  assert_throws_js(TypeError, () => encoder.configure(badConfig));
+
+  encoder.encode(frame4.clone());
+
+  await encoder.flush();
+
+  assert_equals(output_chunks[0].timestamp, frame3.timestamp);
+  assert_equals(output_chunks[1].timestamp, frame4.timestamp);
+}, 'Test successful encode() after re-configure().');
+
+promise_test(async t => {
+  let output_chunks = [];
+  let codecInit = getDefaultCodecInit(t);
+  codecInit.output = chunk => output_chunks.push(chunk);
+
+  let encoder = new VideoEncoder(codecInit);
+
+  let timestamp = 33333;
+  let frame = await createVideoFrame(640, 480, timestamp);
+
+  encoder.configure(defaultConfig);
+  assert_equals(encoder.state, "configured");
+
+  encoder.encode(frame);
+
+  // |frame| is not longer valid since it has been destroyed.
+  assert_not_equals(frame.timestamp, timestamp);
+  assert_throws_dom("InvalidStateError", () => frame.clone());
 
   encoder.close();
 
-  asyncDone(t);
-}, 'Test successful configure(), encode(), and flush()');
+  return endAfterEventLoopTurn();
+}, 'Test encoder consumes (destroys) frames.');
+
+promise_test(async t => {
+  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+  let frame = await createVideoFrame(640, 480, 0);
+
+  return testClosedCodec(t, encoder, defaultConfig, frame);
+}, 'Verify closed VideoEncoder operations');
+
+promise_test(async t => {
+  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+  let frame = await createVideoFrame(640, 480, 0);
+
+  return testUnconfiguredCodec(t, encoder, frame);
+}, 'Verify unconfigured VideoEncoder operations');
+
+promise_test(async t => {
+  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+  let frame = await createVideoFrame(640, 480, 0);
+  frame.destroy();
+
+  encoder.configure(defaultConfig);
+
+  frame.destroy();
+  assert_throws_dom("OperationError", () => {
+    encoder.encode(frame)
+  });
+}, 'Verify encoding destroyed frames throws.');
+
 </script>
 </html>
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-frame-serialization.html b/tests/wpt/web-platform-tests/webcodecs/video-frame-serialization.html
new file mode 100644
index 00000000000..8c111488e7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/video-frame-serialization.html
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+<title>Test posting VideoFrames.</title>
+<body></body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/media.js"></script>
+<script src="/webcodecs/utils.js"></script>
+<script>
+
+var defaultInit = {
+  timestamp : 100,
+  duration : 33,
+}
+
+function createDefaultVideoFrame() {
+  let image = makeImageBitmap(32,16);
+
+  return new VideoFrame(image, defaultInit);
+}
+
+test(t => {
+  let frame = createDefaultVideoFrame();
+
+  let clone = frame.clone();
+
+  assert_equals(frame.timestamp, clone.timestamp);
+  assert_equals(frame.duration, clone.duration);
+  assert_equals(frame.cropWidth, clone.cropWidth);
+  assert_equals(frame.cropHeight, clone.cropHeight);
+  assert_equals(frame.cropWidth, clone.cropWidth);
+  assert_equals(frame.cropHeight, clone.cropHeight);
+
+  frame.destroy();
+  clone.destroy();
+}, 'Test we can clone a VideoFrame.');
+
+test(t => {
+  let frame = createDefaultVideoFrame();
+
+  let copy = frame;
+  let clone = frame.clone();
+
+  frame.destroy();
+
+  assert_not_equals(copy.timestamp, defaultInit.timestamp);
+  assert_equals(clone.timestamp, defaultInit.timestamp);
+
+  clone.destroy();
+}, 'Verify destroying a frame doesn\'t affect its clones.');
+
+test(t => {
+  let frame = createDefaultVideoFrame();
+
+  frame.destroy();
+
+  assert_throws_dom("InvalidStateError", () => {
+    let clone = frame.clone();
+  });
+}, 'Verify cloning a destroyed frame throws.');
+
+async_test(t => {
+  let localFrame = createDefaultVideoFrame();
+
+  let channel = new MessageChannel();
+  let localPort = channel.port1;
+  let externalPort = channel.port2;
+
+  externalPort.onmessage = t.step_func((e) => {
+    let externalFrame = e.data;
+    externalFrame.destroy();
+    externalPort.postMessage("Done");
+  })
+
+  localPort.onmessage = t.step_func_done((e) => {
+    assert_not_equals(localFrame.timestamp, defaultInit.timestamp);
+  })
+
+  localPort.postMessage(localFrame);
+
+}, 'Verify destroying frames propagates accross contexts.');
+
+async_test(t => {
+  let localFrame = createDefaultVideoFrame();
+
+  let channel = new MessageChannel();
+  let localPort = channel.port1;
+  let externalPort = channel.port2;
+
+  externalPort.onmessage = t.step_func((e) => {
+    let externalFrame = e.data;
+    externalFrame.destroy();
+    externalPort.postMessage("Done");
+  })
+
+  localPort.onmessage = t.step_func_done((e) => {
+    assert_equals(localFrame.timestamp, defaultInit.timestamp);
+    localFrame.destroy();
+  })
+
+  localPort.postMessage(localFrame.clone());
+
+}, 'Verify destroying cloned frames doesn\'t propagate accross contexts.');
+
+async_test(t => {
+  let localFrame = createDefaultVideoFrame();
+
+  let channel = new MessageChannel();
+  let localPort = channel.port1;
+
+  localPort.onmessage = t.unreached_func();
+
+  localFrame.destroy();
+
+  assert_throws_dom("DataCloneError", () => {
+    localPort.postMessage(localFrame);
+  });
+
+  t.done();
+}, 'Verify posting destroyed frames throws.');
+
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-frame.html b/tests/wpt/web-platform-tests/webcodecs/video-frame.html
new file mode 100644
index 00000000000..de39603b153
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/video-frame.html
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<title>Test the VideoFrame API.</title>
+<body></body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/webcodecs/utils.js"></script>
+<script>
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 10});
+
+  assert_equals(frame.timestamp, 10, "timestamp");
+  assert_equals(frame.duration, null, "duration");
+  assert_equals(frame.cropWidth, 32, "cropWidth");
+  assert_equals(frame.cropHeight, 16, "cropHeight");
+  assert_equals(frame.cropWidth, 32, "displayWidth");
+  assert_equals(frame.cropHeight, 16, "displayHeight");
+
+  frame.destroy();
+}, 'Test we can construct a VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(1, 1);
+  let frame = new VideoFrame(image, {timestamp: 10});
+
+  assert_equals(frame.cropWidth, 1, "cropWidth");
+  assert_equals(frame.cropHeight, 1, "cropHeight");
+  assert_equals(frame.cropWidth, 1, "displayWidth");
+  assert_equals(frame.cropHeight, 1, "displayHeight");
+
+  frame.destroy();
+}, 'Test we can construct an odd-sized VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 0});
+
+  // TODO(sandersd): This would be more clear as RGBA, but conversion has
+  // not be specified (or implemented) yet.
+  if (frame.format !== "I420") {
+    return;
+  }
+  assert_equals(frame.planes.length, 3, "number of planes");
+
+  // Validate Y plane metadata.
+  let yPlane = frame.planes[0];
+  let yStride = yPlane.stride;
+  let yRows = yPlane.rows;
+  let yLength = yPlane.length;
+
+  // Required minimums to contain the visible data.
+  assert_greater_than_equal(yRows, 16, "Y plane rows");
+  assert_greater_than_equal(yStride, 32, "Y plane stride");
+  assert_greater_than_equal(yLength, 32 * 16, "Y plane length");
+
+  // Not required by spec, but sets limit at 50% padding per dimension.
+  assert_less_than_equal(yRows, 32, "Y plane rows");
+  assert_less_than_equal(yStride, 64, "Y plane stride");
+  assert_less_than_equal(yLength, 32 * 64, "Y plane length");
+
+  // Validate Y plane data.
+  let buffer = new ArrayBuffer(yLength);
+  let view = new Uint8Array(buffer);
+  frame.planes[0].readInto(view);
+
+  // TODO(sandersd): This probably needs to be fuzzy unless we can make
+  // guarantees about the color space.
+  assert_equals(view[0], 94, "Y value at (0, 0)");
+
+  frame.destroy();
+}, 'Test we can read planar data from a VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+  let frame = new VideoFrame(image, {timestamp: 0});
+
+  // TODO(sandersd): This would be more clear as RGBA, but conversion has
+  // not be specified (or implemented) yet.
+  if (frame.format !== "I420") {
+    return;
+  }
+
+  assert_equals(frame.planes.length, 3, "number of planes");
+
+  // Attempt to read Y plane data, but destroy the frame first.
+  let yPlane = frame.planes[0];
+  let yLength = yPlane.length;
+  frame.destroy();
+
+  let buffer = new ArrayBuffer(yLength);
+  let view = new Uint8Array(buffer);
+  assert_throws_dom("InvalidStateError", () => yPlane.readInto(view));
+}, 'Test we cannot read planar data from a destroyed VideoFrame.');
+
+test(t => {
+  let image = makeImageBitmap(32, 16);
+
+  image.close();
+
+  assert_throws_dom("InvalidStateError", () => {
+    let frame = new VideoFrame(image, {timestamp: 10});
+  })
+}, 'Test constructing VideoFrames from closed ImageBitmap throws.');
+
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/webcodecs/vp9.mp4 b/tests/wpt/web-platform-tests/webcodecs/vp9.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..7553e5cae9202c0f144126910e9471658038b455
GIT binary patch
literal 6159
zcmZvA1z42d^8eDUl;i?Shm>@POLqu}(uj2K$}X`ION)ro-Q6Ocx(G^_qzDMoh)8$r
zZ^3*2_xr!kooDBrIiHz#&YYQZ-hG|}004mYa0Ju|25|!bumRT+!y;}_v3mdjfY9E<
z&JF;e{_JLJ4G-1`Q3O!!+&UtZ;sDZV0tjP}6Q>`e*PdU^NADrGklduZ%*l&>;3K5u
z`lY$#xR0LNK1#3W0?oMpLO1yg>|L_ULbV4Up4&sJ4WfPb0;1J5`}h2(E~CqkaGM`k
z?V=ApK*}}}K6d{&oVRH?YimEY!qKn0Rf_WdxCae6e$n4@QUI9&_M>wQB3IekVMa#C
zpUUNEOrB02XSVsre@IFNSKjEQc7!_O$NQMEQT!12mE1M9V!L^-mPcxGsw4M3%_^k3
zMy@zl9Fb7;Y)<wA<iYr47CV}1s3OqxAz{C{DMMp5@to9{-1)EAjhL>A&xu|oUq*i5
zt9?gww}g;NuTZbR-z+Z$^Yw1_3JeA(G<IpDL^K0>H=W16<`kVi=2{|wIE?8tZmBkK
zwQNutGF~E_qfi~b8X^o<RU0eM6E$zwJxU4w#(Olb*n7V_b9yO1uQtr;%1c)#Q%6jn
z*2Hj!lOjBjjId#C0XG$0vD-j8cd&$W(8e`zmQj^Ft6_XDM$Q~{K&XD0waV0-eVo<b
zqw`*RfAB<~XL7d4S!V3)30MI}OGgzu9DMd_XO@UkK&<=W3k?q5m5c}#6FG#@LCH`s
z!$G;~6BAsskcBMn%dB93=-XM-IzCo^P6d0Bn&O@_EP9vMN{^3N&5A*&)5L07CK|6t
zS*Zj(DmD-I>6UrE4>+a$d?74zx1&pS^clNc0;Mb{w~LpUn`A!skezqcgEGYu{p=8g
z5Pa^cXW=}x@NgoD78bw4t1Sxk>K<-B&Wf@dNp|Y6soaV*h<&s++4jx@E*JNbuS5Ho
zLquPv&PSiD|B606C$$nfE#R;EYdoTmvdJRE%2|eSS6}FgIX}s<wYt4j><G!wBbdr>
z28_`+gM3Di70-^gQ5>t4r~0VGl?0Y$r0k5o|5+Z>P*jWyCA9aYZWySlTXZWCfcJB+
zdS}=&=^b!V>RX!piHKbDxtxNtaA}gBNzL|lD+}K90%6zEG6{$8)}a}Et1ka&ecC2I
znzE{0>Y#gSXmEDmmROL{9pOmtdau)1F`i(Ia@C=eH;HCqSD^QO=(CsM-n-gMaGS46
zHqfV^k@uF3a7UG~0!bjj{N&+1EK9LW_5&viu5*s1iVQ0>o6l|emGVtHz>!AoX_j=G
z<W+ZBfmC}1Sbig#e<<4h%}iVR-d-}l$=HE(w7-|zz@7>V^xWZjIrhgmn@UG+G*OoF
zzF^dgQ|_4KQ8RPI3Eu?K1fx6U0XK^Q{!U!F{_W(lyZFlO>?>}oeywKo$CqUGrZQg=
znNe3x_%Aw%8Uuz``gCI{o(YW~7m#?KXW_9bi(Cc|Iph{sYIj|+zus@SNYgzT;P^1J
z@0XFNPH(<eCMZOaeW8M0(u@PwU0lsAB8KKpzkR>~da1uV*?~CuwztOgRjL@3HE692
zMD?J=8aX_DR*yodN$x?d9o!goG!`VsCPZI>9tX64FGYr|TcM#I!89@f)(PM1T)Ds5
zv~%C$X@}?uyjwJ>BD1r$?fl?QbyOV#aLRm<e=7=W_`Bp$jlqi@1G1(KEh|A_?5e)(
z%67FE+S8BYHAJ+#b-fbzxUhan^%<TfU7ApM7P7uoLvgzE9%svQH3L1RIuiRq&v`DS
zZi^!#NfnftX~{-TFe(N<ylvI^r;#Dn9Q>tzhH-xH)t1-=biG#WRy_KU_m+Edh*rsN
zaYP`_w|?Qpcljrry(%qcj*<1nRjpRVnbaQUz1eHTCv5y(O`87I?8bUo<X?)6_HJ!M
z+`p|F5la`w+M`cxijdrY?EQkMU>oR{%!U@cc^z!9UfNi~@4XT2(8%{{;;xoMae{+X
zBPl{oR_CeNAm!QdRdwdSQ2Zu1+}tT^F8R>(kFhAXE_^Fm!Q{#0)r3H_!|A)%%p@n3
z`twPG+S%DKx@r0j>jCuTvV#ibWY5ToI_DANC%etOcl?tU2xX|Y>fM4$ApL1*1)p}V
z(EHg|xP2uDIxB(8yCPBZlev;@q<05Ab2g<(TkTtQc$N-@!_G3%TaD0mr&PK1Phk+L
zvE|6NNYC0i+t(ray#k-Aj)V(@`hA%xOJop|>6c7s)!T2iTExIu8CZ?cFRa%27Sk<W
z6!nBNclA_`2OeiUZAQ&s#f@XdW}1TF(=Mfd-~!&uChVj2uul3P-GPfpZ)8<*Zn+h_
z)Tro@JL0@qG?tLmt67&lMDQhVLgu)Kv@G$Sg!E(sOs31SIfL8ljb}m4_5xnj%VIHa
zL$$L0irFSw;18M@?ZkvjdYyia&J7?%v~lY2hIyew3gAs~+t&*m@bMGRqi5px12Y$1
zhY{}g)*#4(?-M~I=pN1Dg&i^EY1a)r_;D8;P)Uxmqn9szwaSR~n_)o-FSG1%W#h#u
zty^IKA=Wu{-iH36cagxNe!N-7G&x=K<I5ZXy42B6<Q`U^c08#?xq)bIo;VL})OPKG
zz~<WfWkI(<_C|%5M03MN4E&8<!byw6ar0)mzxbvYdJ)CHv&1?S*E%MqBy0?2%DN41
zz5cl#ZolTC*95%i`W<Pttg3i9rfbCGnV%(kKQ;4oThi#(I~SR{D?<>?M6j&cbj1Th
z_r=}OUFu0Z)LB9Cto$b582Zz|6VLb<{ve`ZSvzfwucCrcnq!g=d!A+5);g;I)-%(p
zj=U-9uzv)->ppvLB73etfKTZv{>HXbGQ)B?%6@sm<3)l^ZK7_WoTM33+i?J@R3qMr
z`!~@^czigC_1Y}Hys{4u0l=nL`#2qMw1TOml8P{7aIG~y8W-A{EZLpuY!Es5)!2K#
z_!&Q#RyYS5cD9}eF9{<gmh8SLX?w7(d$;by!ShSp3>Gl|EoZ^{i&wg&Tj(|AH}O3+
z`F-U~F`enIW;FN7^QDg7`<2o*xqC8xf4aj<WD`ZPp`<8AO?M$3s$;uCa9H}}IFX?E
zs<qp~d6QRECT<D@#;ZXGRnr>nq&2t|o_|D1C{a^y_TM|D^RoK{TJG{`-giCt)0Z!E
zrCYbzvmx4n8#V%o!1L1G+xk*IwK6+;Tr?6!L=>T4_3OxOcTKkXYE-IzbDwwk5@<9&
zU^_B+81=qzzt3N7$HfPyb!}gddFcv#)T-p*H4>-|l!=W(Zc!HcT?V*);NPn2K+pRV
zzcka;*V_l9W?d&K5%}IN(#T4e#@02++<_n~tapX-t0o)$#hP_|GRRsV_~HlHzWY)q
z9qZ{am#us;_-A@FANjgy%d5())Ub9gvDY{|8b9=a1pxu(+68@T%u(XY%+VZ_PWfR*
zu|6)l36>IP0sPJrT{Yh5R0?4`D_mAzEvP_bP!#yW$$8y|JzRF!RrQ-OvPoig-~#EM
z3`zAf<)q79E>r|Te3}rdkA}^=`_gq%u%yviLt0~_dm0+!{(G*EvGI(R`HX{P0T!+!
z=e4j{UnN;#^zI>ee7fdn;x?k9x2V>Sq`v8J%6}8rApgGpN`vDG_UrW;*D}4*fVHWu
zUj9DLXmAhLM*hM9h<Kf)a25ZQfpYB&rHK8exh3OB2*YD|E=Oqnhbsb2afNw*6PuCQ
z!+|l0ZKPDp7G>8}8dKYqyvWr3Y1+={HIsNXJjfE=L*l5Z!QqBXu~Z>bk>&L_t^QxJ
zcVmo?(th3bo{+}Xk&s0+g0GSV#?M<U?uYS|yHkQEkn<ktsK%blJV?;d)BBk~;V=0i
z=aqvNvAp)}I9u(+gk8JpIRs{lHVN&YD!BI|`-><fNHSr)@Z^aoe}f#qgY7CuK!@Qx
z*&7e<j8;DiPah;vRzvXJ(zF3}Wb1hc;nQs}*udm7Ix?ST8DvR?<&q)SWi0P-9^|!$
z{gjE2+l%V$EPC%SDGdn?v8SaU57YV48dw<fGjfMu>&g3Z!ad-q60u^H20w@UM-5oz
zPdV)Ku_&7(V?s9xt_urA5eGhHS_(R21>z2lCg0}<IxGuu0m35$U6Wm&1O;)5StdQ9
zM)6Zk3>DyP>ne0OZzyF-S!PoXk597b;+6>K>8X^w#&!tDn$Ywb`6FenTm8ZHDWp4w
zIl^eQ?VeBgQKrB5YV-CpcIOcvCRb|fZJQMRk@)w2&4&(tr%q$pkTpz7mWf;NU&s5D
zQ!@PXP9Vu^s&`iLi*a`XxJK_t#((;lU1k(9%GDy=sBau~TLCe(S-k|3w7N6qbm7tK
z`BMB9*9@war_tTF$5RG{CNta6%0PGMKtVF^60$~ZAdHFLyTZD`)t!IBHAaTCMSp{X
z%Qtu%t|oG`kI`rz>dD6!p;KR!4}J<QQ#PLU(5JDP2;pv|moWgNB_1q99_+5ioJ!i5
zpBkEf3)^MH34De4K20-~vOIy`+5$M1A2fg}2D;_#%8|Ua*U0Q+z|U7O?E1Ljr2_~D
z$j4=X9s&R~Ug2g#6kDiw4kuk$d_D6z_L)Zt0Kk(6Xmec0IB8<WZ_kFaW6H3K!1{_q
zXZ7xqN3C`tk%BHWcks+6XMBWYe0i!a>)l-!uN=w-DjzV06M|E0oaJ@=T!}Kw{W5#q
zx&4}>X|3<z2_*I1Z*uI~-Vp33>MO|?5<=%}8uO9)-s;=b5PJ?k7i^+hBBrq$ctlBB
zqNhjh_Je9}{jz*#kEeZvP}9(XDT#QgGA~v?Yo$)ej|1H$r79a|{%eVK{O?lKbr%5m
zQ0`1M5GM6qEwz(hSau^DMnLYM)q`w*wX3A(2LRNY=GHNCl$Ap^Auj*E(hk{g!>nmJ
z8Ft#z4%_!9ff7YIcH(mD$H%Kh#W0xt8TR3KmxsM!p`YXf1E8KkrDcvrQe!imGiUQN
zlogzo%y09LQR^q@9Ty?0mn${l^9TW2*5noLM(@=$jjF0(3&Epv#8bAyu>h&s*yZ=*
zJdn?~WhEoU!Vb8!REouh3TIqqco$9DTFOo-{uBpS#AKn(9D7KbDP&>Zq?S}!>cy!U
zE^?oRZ_n~Qq-bQ3SloWNRUXEd031FNp$NR`pFF02L@*_x3uy6EOv_|cV=YmS1y`nP
zEi)v7P6)tBt=_LxRan$*FCa+s`s`{_ESv}QkmuP38nTnciYZTWSMd_HlKQM^&@419
zYvRV$cep<q2Lga-vJF-VLfPLuslNj|Oj>Jt<J6Ab7U~~FJHFD6(rEpy;i!VAq8W?7
z;;wAQ9F*r!sE??I+ec0!Yce~8ML**eU&(IvWq6$lh$q!+w%;@;3Zx?spz!v-Y85*>
zlX*~*C?uexex36xGU5E!Cg8;^+NegB%K7Qjr=qXKt*r2$bCsi27YMh@pHp!?p>+mw
zn_~~4v_g_Ol_JZw-Vc2b5x-TIZhKm7(>GLxGJf1JCMX4)V5Vl3B;b<u_l(8Kx3`<j
zDogT{NR#ep^98A?aAq_cvFA@t>kDU9gG!)WiKwvOe!mbcnO?c!5u}T#g*cqc0HZTi
zYr2}PeAoG~aO%DeN};#U)bqJ!_ChGyBlGM8sy_=ok~LIlc0atx^8BE{LMN+qry{3V
z1mzA{^GyR8%~&KkrI5OIdWFV7f`M@obho2Cf3h`P^`l~C16Wej<_<I>^s$^xdhCXb
z9_l7BwCvB93cLjCv}t#3^|cKQ=P1kE3ahm(`tBdC^2+hL$5Gd36c0*f6^N-7oQmY|
zE<>Q6`kA`%PCy{bCduv!Q`~e)%n`cO^vS&|e)g_d+m8w{#ILlxC=j)73KU9TJ1xJ?
z?A>v{n)c6kxMW+}BIyIQ^PDX=f&&0`cX8&WBHLVDWgza~`;W@psd#3Mipk&(qr%6b
zAmhtlA?3gN$`&#G%?6OA24neP&rmt0;~e-6K2=}Mi%PhNFppZ7%a%X9*^N;^%n`(a
z{(B!9edCrH^d$e{-(qDX%vvJ%X!J+Bt^%VFOid=HsOc9jp$KayQGqYfo5Ga=d|$#h
zvK0*F_h3;HvV8r4d3ip|C?@DqzaXGeqp)p&DMawB9oyl>#65&P^mScuT7TDB%qsWU
zvaSRYE4-m_SJ$D<7)|K^csZYiv2LY@A55+NRF{fvA!X%dv<6N?4sEuNjN0^coyBTE
zarC#_y+S7uj5WJ@ruRrgfGZA_Rup&SZ;GvrDfZtbs3R{+T6J#KFuBPy=*QFG9M1^3
zMP<o7@%>1sw)XSl+<J+Sl?#cE^)KvS(k|m)kTuA$-K0cor9TVO@DSgsysHx$k?z;9
z6^@@-7Okuqh^6kkcGVU(Jhd;2`Xq?8dzNM|L#Hns@duYso}HR5xRhfd2O?xv8h^&2
zsgO=R>|-o!ITU;w@1PgBklcwq!g(7TB1)bW$j|mgkQ~~}%Kzwy6!tf1pe6`F=T*uJ
zL&tY`Sp7asRXQIOl{k>jp>n=%hFX@cORDqQwy?VN_L{X-G&UOzfwKH@u-?`ue5XHB
z=>DOk;j|;1PVDmRKOxYDbo%v}T8S9Zf<@Ce!{fw$oq)~#HYTfuM=%#wwr}jt2fFAm
zLM~o#oXQ2Wy6<#8eY)mJQUkGMqYksR_@PDnFAs+>fk572>^^czkEzeb`Pnus?J124
zoAd3rU-`P_>e3#22qNy#^S$dGHXd$1`&dnBSVD7Ymk?wbGAPROdhXNDqOirVCkDxq
z(f8j16xv3GM5MM;+AoK0e||h)K<ZSw^dJWQrL8b7rw6k=8W#aJmnSGFHQ9Xvirm0>
zesy*q-`heZBq!AkG>qaxvP047hn}a2bG1p;q(uE7^x(`1gN6#Zi8V2foU|mf2bUAa
zI2)V1PICd9$OD>Yl4G+=x=F82z922>VG`qaaeu#F>Nls5)AaA|j^0X-KatI=YCIhH
zAt*W;JI8nrCGKItz1m{XEe?3>h?p>vrWbfZ7w<GBE(5M9G^|*2kOIA}ZHoSl-k@c1
zeE54`(ce9y)!k*2Hr_D*=_t$CuStRrM!(Z}#7<tq$GXtiHqOtNYKzD1(Zxs^kXw*J
z6O5tD`;_Mq+YCowwuHpPhno9{<c#PR%oQOHw;KfFg;8AHyc}&Y@*jk=j<K%;umIP;
z|Iq(8z`*}Cmj93E|I)BA_o@1D4{H~U(H!n_GbheJ9RC&VdhY+C|C;B2&5I?Ed1vS5
zJq|ltI1Hl!?Ob8-8{{U_f5p9th1Kh3>tv0wf!u8Wd+j_Jm<M3=`Q}XlM_X5qf5iZJ
zIoV?Fe*Z&{F=L3jwY#mW-L(%E+|9||9-~lux!nZ)XWAULe{Dcp54&rhYr3|RdV08m
z{_0p_F!(c9jGh34!~WfnYoAarsIW9fUeiBg{srVQ%f|dA-thnQxN-aEgARRtMNI7l
zwNbhWM;(lfjcE>si0z&1TyHRPs5K1pQNEe)8lZ#0Z;E>Dbv-5q0C2B$YD})z#lEI%
z{F;Fn%;p-v(7!Q^|BZehV|#I9`TM}&r281PAH#<juE4lSVPqMGJ27038DG~T8^f5n
zY#<nUP1kYxG5pNa7H*A^rfzmO5~BiG|JgK5qdlyl(CfPXKN4{IyE8aT;gIWqOqk33
X>mb)b0ovAH_To~4V&a1LgoXbPhndVT

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py
index 1dde379c8a8..32bf6f59d4f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/execute.py
@@ -4,6 +4,7 @@ from webdriver.transport import Response
 
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
+from tests.support.sync import Poll
 
 
 def execute_script(session, script, args=None):
@@ -28,6 +29,24 @@ def test_no_browsing_context(session, closed_window):
     assert_error(response, "no such window")
 
 
+def test_opening_new_window_keeps_current_window_handle(session):
+    original_handle = session.window_handle
+    original_handles = session.handles
+
+    url = inline("""<a href="javascript:window.open();">open window</a>""")
+    session.url = url
+    session.find.css("a", all=False).click()
+    wait = Poll(
+        session,
+        timeout=5,
+        message="No new window has been opened")
+    new_handles = wait.until(lambda s: set(s.handles) - set(original_handles))
+
+    assert len(new_handles) == 1
+    assert session.window_handle == original_handle
+    assert session.url == url
+
+
 def test_ending_comment(session):
     response = execute_script(session, "return 1; // foo")
     assert_success(response, 1)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
index c22e3d410c3..378ba27f2b2 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
@@ -3,12 +3,9 @@ from six import text_type
 from tests.support import platform_name
 from tests.support.inline import inline
 from tests.support.asserts import assert_error, assert_success
-from tests.support.sync import Poll
 
+doc = inline("<p>frame")
 alert_doc = inline("<script>window.alert()</script>")
-frame_doc = inline("<p>frame")
-one_frame_doc = inline("<iframe src='%s'></iframe>" % frame_doc)
-two_frames_doc = inline("<iframe src='%s'></iframe>" % one_frame_doc)
 
 
 def get_current_url(session):
@@ -22,18 +19,18 @@ def test_no_browsing_context(session, closed_window):
 
 
 def test_get_current_url_matches_location(session):
-    url = session.execute_script("return window.location.href")
+    session.url = doc
 
     response = get_current_url(session)
-    assert_success(response, url)
+    assert_success(response, doc)
 
 
 def test_get_current_url_payload(session):
     session.start()
 
     response = get_current_url(session)
-    assert response.status == 200
-    assert isinstance(response.body["value"], text_type)
+    value = assert_success(response)
+    assert isinstance(value, text_type)
 
 
 def test_get_current_url_special_pages(session):
@@ -73,32 +70,13 @@ def test_set_malformed_url(session):
 
 
 def test_get_current_url_after_modified_location(session):
-    start = get_current_url(session)
-    session.execute_script("window.location.href = 'about:blank#wd_test_modification'")
-    Poll(session, message="URL did not change").until(
-        lambda s: get_current_url(s).body["value"] != start.body["value"])
+    session.url = doc
 
     response = get_current_url(session)
-    assert_success(response, "about:blank#wd_test_modification")
+    assert_success(response, doc)
 
-
-def test_get_current_url_nested_browsing_context(session, create_frame):
-    session.url = "about:blank#wd_from_within_frame"
-    session.switch_frame(create_frame())
+    hash_doc = "{}#foo".format(doc)
+    session.url = hash_doc
 
     response = get_current_url(session)
-    assert_success(response, "about:blank#wd_from_within_frame")
-
-
-def test_get_current_url_nested_browsing_contexts(session):
-    session.url = two_frames_doc
-    top_level_url = session.url
-
-    outer_frame = session.find.css("iframe", all=False)
-    session.switch_frame(outer_frame)
-
-    inner_frame = session.find.css("iframe", all=False)
-    session.switch_frame(inner_frame)
-
-    response = get_current_url(session)
-    assert_success(response, top_level_url)
+    assert_success(response, hash_doc)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py
new file mode 100644
index 00000000000..944e61b583f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/iframe.py
@@ -0,0 +1,65 @@
+import pytest
+
+from tests.support.asserts import assert_success
+from tests.support.inline import iframe, inline
+
+
+"""
+Tests that WebDriver can transcend site origins.
+
+Many modern browsers impose strict cross-origin checks,
+and WebDriver should be able to transcend these.
+
+Although an implementation detail, certain browsers
+also enforce process isolation based on site origin.
+This is known to sometimes cause problems for WebDriver implementations.
+"""
+
+frame_doc = inline("<p>frame")
+one_frame_doc = inline("<iframe src='%s'></iframe>" % frame_doc)
+nested_frames_doc = inline("<iframe src='%s'></iframe>" % one_frame_doc)
+
+
+def get_current_url(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/url".format(**vars(session)))
+
+
+def test_iframe(session):
+    top_level_doc = one_frame_doc
+    session.url = top_level_doc
+
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+    session.find.css("p", all=False)
+
+    response = get_current_url(session)
+    assert_success(response, top_level_doc)
+
+
+def test_nested_iframe(session):
+    session.url = nested_frames_doc
+    top_level_doc = session.url
+
+    outer_frame = session.find.css("iframe", all=False)
+    session.switch_frame(outer_frame)
+
+    inner_frame = session.find.css("iframe", all=False)
+    session.switch_frame(inner_frame)
+    session.find.css("p", all=False)
+
+    response = get_current_url(session)
+    assert_success(response, top_level_doc)
+
+
+@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
+def test_origin(session, domain, url):
+    top_level_doc = inline(iframe("<p>frame", domain=domain))
+
+    session.url = top_level_doc
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+    session.find.css("p", all=False)
+
+    response = get_current_url(session)
+    assert_success(response, top_level_doc)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
index f0e58acbe99..7bb83c3f9cd 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
@@ -1,10 +1,7 @@
+from six import text_type
+
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
-from tests.support.sync import Poll
-
-
-def read_global(session, name):
-    return session.execute_script("return %s;" % name)
 
 
 def get_title(session):
@@ -12,56 +9,44 @@ def get_title(session):
         "GET", "session/{session_id}/title".format(**vars(session)))
 
 
+def test_payload(session):
+    session.start()
+
+    response = get_title(session)
+    value = assert_success(response)
+    assert isinstance(value, text_type)
+
+
 def test_no_browsing_context(session, closed_window):
     response = get_title(session)
     assert_error(response, "no such window")
 
 
-def test_title_from_top_context(session):
-    session.url = inline("<title>Foobar</title><h2>Hello</h2>")
-
-    result = get_title(session)
-    assert_success(result, read_global(session, "document.title"))
-
-
-def test_title_with_duplicate_element(session):
+def test_with_duplicated_title(session):
     session.url = inline("<title>First</title><title>Second</title>")
 
     result = get_title(session)
-    assert_success(result, read_global(session, "document.title"))
+    assert_success(result, "First")
 
 
-def test_title_without_element(session):
+def test_without_title(session):
     session.url = inline("<h2>Hello</h2>")
 
     result = get_title(session)
-    assert_success(result, read_global(session, "document.title"))
+    assert_success(result, "")
 
 
-def test_title_after_modification(session):
-    def title():
-        return read_global(session, "document.title")
-
+def test_after_modification(session):
     session.url = inline("<title>Initial</title><h2>Hello</h2>")
     session.execute_script("document.title = 'Updated'")
 
-    wait = Poll(session, message='Document title does not match "{}"'.format(title()))
-    wait.until(lambda s: assert_success(get_title(s)) == title())
+    result = get_title(session)
+    assert_success(result, "Updated")
 
 
-def test_title_strip_and_collapse(session):
+def test_strip_and_collapse(session):
     document = "<title>   a b\tc\nd\t \n e\t\n </title><h2>Hello</h2>"
     session.url = inline(document)
 
     result = get_title(session)
-    assert_success(result, read_global(session, "document.title"))
-
-
-def test_title_from_frame(session, create_frame):
-    session.url = inline("<title>Parent</title>parent")
-
-    session.switch_frame(create_frame())
-    session.switch_frame(create_frame())
-
-    result = get_title(session)
-    assert_success(result, "Parent")
+    assert_success(result, "a b c d e")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py
new file mode 100644
index 00000000000..5991bf35906
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/iframe.py
@@ -0,0 +1,70 @@
+import pytest
+
+from tests.support.asserts import assert_success
+from tests.support.inline import iframe, inline
+
+
+"""
+Tests that WebDriver can transcend site origins.
+
+Many modern browsers impose strict cross-origin checks,
+and WebDriver should be able to transcend these.
+
+Although an implementation detail, certain browsers
+also enforce process isolation based on site origin.
+This is known to sometimes cause problems for WebDriver implementations.
+"""
+
+frame_doc = inline("<title>cheese</title><p>frame")
+one_frame_doc = inline("<title>bar</title><iframe src='%s'></iframe>" % frame_doc)
+nested_frames_doc = inline("<title>foo</title><iframe src='%s'></iframe>" % one_frame_doc)
+
+
+def get_title(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/title".format(**vars(session)))
+
+
+def test_no_iframe(session):
+    session.url = inline("<title>Foobar</title><h2>Hello</h2>")
+
+    result = get_title(session)
+    assert_success(result, "Foobar")
+
+
+def test_iframe(session):
+    session.url = one_frame_doc
+
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+    session.find.css("p", all=False)
+
+    response = get_title(session)
+    assert_success(response, "bar")
+
+
+def test_nested_iframe(session):
+    session.url = nested_frames_doc
+
+    outer_frame = session.find.css("iframe", all=False)
+    session.switch_frame(outer_frame)
+
+    inner_frame = session.find.css("iframe", all=False)
+    session.switch_frame(inner_frame)
+    session.find.css("p", all=False)
+
+    response = get_title(session)
+    assert_success(response, "foo")
+
+
+@pytest.mark.parametrize("domain", ["", "alt"], ids=["same_origin", "cross_origin"])
+def test_origin(session, domain, url):
+    session.url = inline("<title>foo</title>{}".format(
+        iframe("<title>bar</title><p>frame", domain=domain)))
+
+    frame = session.find.css("iframe", all=False)
+    session.switch_frame(frame)
+    session.find.css("p", all=False)
+
+    response = get_title(session)
+    assert_success(response, "foo")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py
index 0bf94496572..9300b04c45f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_tab.py
@@ -1,4 +1,5 @@
 from tests.support.asserts import assert_success
+from tests.support.inline import inline
 
 from . import opener, window_name
 
@@ -9,7 +10,7 @@ def new_window(session, type_hint=None):
         {"type": type_hint})
 
 
-def test_new_tab(session):
+def test_payload(session):
     original_handles = session.handles
 
     response = new_window(session, type_hint="tab")
@@ -21,16 +22,31 @@ def test_new_tab(session):
     assert value["type"] == "tab"
 
 
-def test_new_tab_opens_about_blank(session):
+def test_keeps_current_window_handle(session):
+    original_handle = session.window_handle
+
     response = new_window(session, type_hint="tab")
     value = assert_success(response)
     assert value["type"] == "tab"
 
+    assert session.window_handle == original_handle
+
+
+def test_opens_about_blank_in_new_tab(session):
+    url = inline("<p>foo")
+    session.url = url
+
+    response = new_window(session, type_hint="tab")
+    value = assert_success(response)
+    assert value["type"] == "tab"
+
+    assert session.url == url
+
     session.window_handle = value["handle"]
     assert session.url == "about:blank"
 
 
-def test_new_tab_sets_no_window_name(session):
+def test_sets_no_window_name(session):
     response = new_window(session, type_hint="tab")
     value = assert_success(response)
     assert value["type"] == "tab"
@@ -39,7 +55,7 @@ def test_new_tab_sets_no_window_name(session):
     assert window_name(session) == ""
 
 
-def test_new_tab_sets_no_opener(session):
+def test_sets_no_opener(session):
     response = new_window(session, type_hint="tab")
     value = assert_success(response)
     assert value["type"] == "tab"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py
index 8b12248a552..b34854cc2f3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/new_window/new_window.py
@@ -1,4 +1,5 @@
 from tests.support.asserts import assert_success
+from tests.support.inline import inline
 
 from . import opener, window_name
 
@@ -9,7 +10,7 @@ def new_window(session, type_hint=None):
         {"type": type_hint})
 
 
-def test_type_with_window(session):
+def test_payload(session):
     original_handles = session.handles
 
     response = new_window(session, type_hint="window")
@@ -21,16 +22,31 @@ def test_type_with_window(session):
     assert value["type"] == "window"
 
 
-def test_new_window_opens_about_blank(session):
+def test_keeps_current_window_handle(session):
+    original_handle = session.window_handle
+
     response = new_window(session, type_hint="window")
     value = assert_success(response)
     assert value["type"] == "window"
 
+    assert session.window_handle == original_handle
+
+
+def test_opens_about_blank_in_new_window(session):
+    url = inline("<p>foo")
+    session.url = url
+
+    response = new_window(session, type_hint="window")
+    value = assert_success(response)
+    assert value["type"] == "window"
+
+    assert session.url == url
+
     session.window_handle = value["handle"]
     assert session.url == "about:blank"
 
 
-def test_new_window_sets_no_window_name(session):
+def test_sets_no_window_name(session):
     response = new_window(session, type_hint="window")
     value = assert_success(response)
     assert value["type"] == "window"
@@ -39,7 +55,7 @@ def test_new_window_sets_no_window_name(session):
     assert window_name(session) == ""
 
 
-def test_new_window_sets_no_opener(session):
+def test_sets_no_opener(session):
     response = new_window(session, type_hint="window")
     value = assert_success(response)
     assert value["type"] == "window"
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py
index dffae0b98cd..5ee8ae1c741 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py
@@ -1,5 +1,22 @@
 import pytest
 
+from webdriver.error import NoSuchWindowException
+
+
+@pytest.fixture
+def session_new_window(capabilities, session):
+    # Prevent unreleased dragged elements by running the test in a new window.
+    original_handle = session.window_handle
+    session.window_handle = session.new_window()
+
+    yield session
+
+    try:
+        session.window.close()
+    except NoSuchWindowException:
+        pass
+
+    session.window_handle = original_handle
 
 @pytest.fixture
 def key_chain(session):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
index d021eee7c94..ca7d7b1be48 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
@@ -144,12 +144,13 @@ def test_drag_and_drop(session,
 
 
 @pytest.mark.parametrize("drag_duration", [0, 300, 800])
-def test_drag_and_drop_with_draggable_element(session,
+def test_drag_and_drop_with_draggable_element(session_new_window,
                        test_actions_page,
                        mouse_chain,
                        drag_duration):
-    drag_target = session.find.css("#draggable", all=False)
-    drop_target = session.find.css("#droppable", all=False)
+    new_session = session_new_window
+    drag_target = new_session.find.css("#draggable", all=False)
+    drop_target = new_session.find.css("#droppable", all=False)
     # Conclude chain with extra move to allow time for last queued
     # coordinate-update of drag_target and to test that drag_target is "dropped".
     mouse_chain \
@@ -163,7 +164,8 @@ def test_drag_and_drop_with_draggable_element(session,
         .pointer_move(80, 50, duration=100, origin="pointer") \
         .perform()
     # mouseup that ends the drag is at the expected destination
-    e = get_events(session)
+    e = get_events(new_session)
+    assert len(e) >= 5
     assert e[1]["type"] == "dragstart", "Events captured were {}".format(e)
     assert e[2]["type"] == "dragover", "Events captured were {}".format(e)
     drag_events_captured = [ev["type"] for ev in e if ev["type"].startswith("drag") or ev["type"].startswith("drop")]
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py
index 3dd64ca456f..81d51be1a7e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer_tripleclick.py
@@ -4,7 +4,7 @@ from tests.support.inline import inline
 
 lots_of_text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor "\
                "incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud "\
-               " exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+               "exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
 
 
 def test_tripleclick_at_coordinates(session, mouse_chain):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py b/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
index 8f3d99af808..51b9fac8592 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/print/printcmd.py
@@ -2,6 +2,8 @@ import base64
 
 import pytest
 
+from six import ensure_binary
+
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
 
@@ -13,8 +15,8 @@ def do_print(session, options):
 
 
 def assert_pdf(data):
-    assert data.startswith("%PDF-"), "Decoded data starts with the PDF signature"
-    assert data.endswith("%%EOF\n"), "Decoded data ends with the EOF flag"
+    assert data.startswith(b"%PDF-"), "Decoded data starts with the PDF signature"
+    assert data.endswith(b"%%EOF\n"), "Decoded data ends with the EOF flag"
 
 
 def test_no_browsing_context(session, closed_window):
@@ -31,7 +33,7 @@ def test_html_document(session):
         "shrinkToFit": False
     })
     value = assert_success(response)
-    pdf = base64.decodestring(value)
+    pdf = base64.decodestring(ensure_binary(value))
     # TODO: Test that the output is reasonable
     assert_pdf(pdf)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py
index f416f9c28dd..f510300cb79 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/print/user_prompts.py
@@ -3,6 +3,8 @@ import base64
 
 import pytest
 
+from six import ensure_binary
+
 from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
 from tests.support.inline import inline
 from printcmd import do_print, assert_pdf
@@ -18,7 +20,7 @@ def check_user_prompt_closed_without_exception(session, create_dialog):
         response = do_print(session, {})
         value = assert_success(response)
 
-        pdf = base64.decodestring(value)
+        pdf = base64.decodestring(ensure_binary(value))
         assert_dialog_handled(session, expected_text=dialog_type, expected_retval=retval)
 
         assert_pdf(pdf)
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedAudioFrame-serviceworker-failure.https.html b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedAudioFrame-serviceworker-failure.https.html
index 79708e706de..ea44485fe6f 100644
--- a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedAudioFrame-serviceworker-failure.https.html
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedAudioFrame-serviceworker-failure.https.html
@@ -10,7 +10,7 @@
 <script>
 "use strict";
 promise_test(async t => {
-  const caller = new RTCPeerConnection({forceEncodedAudioInsertableStreams:true});
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
   t.add_cleanup(() => caller.close());
   const callee = new RTCPeerConnection();
   t.add_cleanup(() => callee.close());
@@ -20,9 +20,9 @@ promise_test(async t => {
   t.add_cleanup(() => track.stop());
 
   const sender = caller.addTrack(track)
-  const streams = sender.createEncodedAudioStreams();
-  const reader = streams.readableStream.getReader();
-  const writer = streams.writableStream.getWriter();
+  const streams = sender.createEncodedStreams();
+  const reader = streams.readable.getReader();
+  const writer = streams.writable.getWriter();
 
   exchangeIceCandidates(caller, callee);
   await exchangeOfferAnswer(caller, callee);
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedVideoFrame-serviceworker-failure.https.html b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedVideoFrame-serviceworker-failure.https.html
index 54b3a54b364..1d92302746b 100644
--- a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedVideoFrame-serviceworker-failure.https.html
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCEncodedVideoFrame-serviceworker-failure.https.html
@@ -10,7 +10,7 @@
 <script>
 "use strict";
 promise_test(async t => {
-  const caller = new RTCPeerConnection({forceEncodedVideoInsertableStreams:true});
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
   t.add_cleanup(() => caller.close());
   const callee = new RTCPeerConnection();
   t.add_cleanup(() => callee.close());
@@ -20,9 +20,9 @@ promise_test(async t => {
   t.add_cleanup(() => videoTrack.stop());
 
   const videoSender = caller.addTrack(videoTrack)
-  const senderStreams = videoSender.createEncodedVideoStreams();
-  const senderReader = senderStreams.readableStream.getReader();
-  const senderWriter = senderStreams.writableStream.getWriter();
+  const senderStreams = videoSender.createEncodedStreams();
+  const senderReader = senderStreams.readable.getReader();
+  const senderWriter = senderStreams.writable.getWriter();
 
   exchangeIceCandidates(caller, callee);
   await exchangeOfferAnswer(caller, callee);
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-audio.https.html b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-audio.https.html
new file mode 100644
index 00000000000..aecf671854c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-audio.https.html
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>RTCPeerConnection Insertable Streams Audio</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script src="./RTCPeerConnection-insertable-streams.js"></script>
+</head>
+<body>
+<script>
+async function testAudioFlow(t, negotiationFunction) {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const audioTrack = stream.getAudioTracks()[0];
+  t.add_cleanup(() => audioTrack.stop());
+
+  const audioSender = caller.addTrack(audioTrack)
+  const senderStreams = audioSender.createEncodedStreams();
+  const senderReader = senderStreams.readable.getReader();
+  const senderWriter = senderStreams.writable.getWriter();
+
+  const frameInfos = [];
+  const numFramesPassthrough = 5;
+  const numFramesReplaceData = 5;
+  const numFramesModifyData = 5;
+  const numFramesToSend = numFramesPassthrough + numFramesReplaceData + numFramesModifyData;
+
+  const ontrackPromise = new Promise(resolve => {
+    callee.ontrack = t.step_func(() => {
+      const audioReceiver = callee.getReceivers().find(r => r.track.kind === 'audio');
+      assert_true(audioReceiver !== undefined);
+
+      const receiverStreams =
+          audioReceiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      const receiverWriter = receiverStreams.writable.getWriter();
+
+      const maxFramesToReceive = numFramesToSend;
+      let numVerifiedFrames = 0;
+      for (let i = 0; i < maxFramesToReceive; i++) {
+        receiverReader.read().then(t.step_func(result => {
+          if (frameInfos[numVerifiedFrames] &&
+              areFrameInfosEqual(result.value, frameInfos[numVerifiedFrames])) {
+            numVerifiedFrames++;
+          } else {
+            // Receiving unexpected frames is an indication that
+            // frames are not passed correctly between sender and receiver.
+            assert_unreached("Incorrect frame received");
+          }
+
+          if (numVerifiedFrames == numFramesToSend)
+            resolve();
+        }));
+      }
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await negotiationFunction(caller, callee);
+
+  // Pass frames as they come from the encoder.
+  for (let i = 0; i < numFramesPassthrough; i++) {
+    const result = await senderReader.read()
+    frameInfos.push({
+      data: result.value.data,
+      timestamp: result.value.timestamp,
+      type: result.value.type,
+      metadata: result.value.getMetadata(),
+      getMetadata() { return this.metadata; }
+    });
+    senderWriter.write(result.value);
+  }
+
+  // Replace frame data with arbitrary buffers.
+  for (let i = 0; i < numFramesReplaceData; i++) {
+    const result = await senderReader.read()
+
+    const buffer = new ArrayBuffer(100);
+    const int8View = new Int8Array(buffer);
+    int8View.fill(i);
+
+    result.value.data = buffer;
+    frameInfos.push({
+      data: result.value.data,
+      timestamp: result.value.timestamp,
+      type: result.value.type,
+      metadata: result.value.getMetadata(),
+      getMetadata() { return this.metadata; }
+    });
+    senderWriter.write(result.value);
+  }
+
+  // Modify frame data.
+  for (let i = 0; i < numFramesReplaceData; i++) {
+    const result = await senderReader.read()
+    const int8View = new Int8Array(result.value.data);
+    int8View.fill(i);
+
+    frameInfos.push({
+      data: result.value.data,
+      timestamp: result.value.timestamp,
+      type: result.value.type,
+      metadata: result.value.getMetadata(),
+      getMetadata() { return this.metadata; }
+    });
+    senderWriter.write(result.value);
+  }
+
+  return ontrackPromise;
+}
+
+promise_test(async t => {
+  return testAudioFlow(t, exchangeOfferAnswer);
+}, 'Frames flow correctly using insertable streams');
+
+promise_test(async t => {
+  return testAudioFlow(t, exchangeOfferAnswerReverse);
+}, 'Frames flow correctly using insertable streams when receiver starts negotiation');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection();
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const audioTrack = stream.getAudioTracks()[0];
+  t.add_cleanup(() => audioTrack.stop());
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  const audioSender = caller.addTrack(audioTrack);
+  assert_throws_dom("InvalidStateError", () => audioSender.createEncodedStreams());
+}, 'RTCRtpSender.createEncodedStream() throws if not requested in PC configuration');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection();
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const audioTrack = stream.getAudioTracks()[0];
+  t.add_cleanup(() => audioTrack.stop());
+
+  const audioSender = caller.addTrack(audioTrack);
+  const ontrackPromise = new Promise(resolve => {
+    callee.ontrack = t.step_func(() => {
+      const audioReceiver = callee.getReceivers().find(r => r.track.kind === 'audio');
+      assert_true(audioReceiver !== undefined);
+      assert_throws_dom("InvalidStateError", () => audioReceiver.createEncodedStreams());
+      resolve();
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+  return ontrackPromise;
+}, 'RTCRtpReceiver.createEncodedStream() throws if not requested in PC configuration');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const track = stream.getTracks()[0];
+  t.add_cleanup(() => track.stop());
+
+  const sender = caller.addTrack(track)
+  const senderStreams = sender.createEncodedStreams();
+
+  const senderWorker = new Worker('RTCPeerConnection-sender-worker-single-frame.js')
+  senderWorker.postMessage(
+    {readableStream: senderStreams.readable},
+    [senderStreams.readable]);
+
+  let expectedFrameData = null;
+  let verifiedFrameData = false;
+  let numVerifiedFrames = 0;
+  const onmessagePromise = new Promise(resolve => {
+    senderWorker.onmessage = t.step_func(message => {
+      if (!(message.data instanceof RTCEncodedAudioFrame)) {
+        // This is the first message sent from the Worker to the test.
+        // It contains an object (not an RTCEncodedAudioFrame) with the same
+        // fields as the RTCEncodedAudioFrame to be sent in follow-up messages.
+        // These serve as expected values to validate that the
+        // RTCEncodedAudioFrame is sent correctly back to the test in the next
+        // message.
+        expectedFrameData = message.data;
+      } else {
+        // This is the frame sent by the Worker after reading it from the
+        // readable stream. The Worker sends it twice after sending the
+        // verification message.
+        assert_equals(message.data.type, expectedFrameData.type);
+        assert_equals(message.data.timestamp, expectedFrameData.timestamp);
+        assert_true(areArrayBuffersEqual(message.data.data, expectedFrameData.data));
+        if (++numVerifiedFrames == 2)
+          resolve();
+      }
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  return onmessagePromise;
+}, 'RTCRtpSender readable stream transferred to a Worker and the Worker sends an RTCEncodedAudioFrame back');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const track = stream.getTracks()[0];
+  t.add_cleanup(() => track.stop());
+
+  const sender = caller.addTrack(track)
+  const streams = sender.createEncodedStreams();
+  const transformer = new TransformStream({
+    transform(frame, controller) {
+      // Inserting the same frame twice will result in failure since the frame
+      // will be neutered after the first insertion is processed.
+      controller.enqueue(frame);
+      controller.enqueue(frame);
+    }
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  await promise_rejects_dom(
+      t, 'OperationError',
+      streams.readable.pipeThrough(transformer).pipeTo(streams.writable));
+}, 'Enqueuing the same frame twice fails');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({forceEncodedAudioInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection({forceEncodedAudioInsertableStreams:true});
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({audio:true});
+  const audioTrack = stream.getAudioTracks()[0];
+  t.add_cleanup(() => audioTrack.stop());
+
+  const audioSender = caller.addTrack(audioTrack)
+  const senderStreams = audioSender.createEncodedStreams();
+  const senderReader = senderStreams.readable.getReader();
+  const senderWriter = senderStreams.writable.getWriter();
+
+  let sentFrameInfo = null;
+  const ontrackPromise = new Promise(resolve => {
+    callee.ontrack = e => {
+      const audioReceiver = e.receiver;
+
+      const receiverStreams = audioReceiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      receiverReader.read().then(t.step_func(receivedResult => {
+        assert_true(areFrameInfosEqual(receivedResult.value, sentFrameInfo));
+        resolve();
+      }));
+    }
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  // Pass frames as they come from the encoder.
+  const result = await senderReader.read()
+  sentFrameInfo = {
+    timestamp: result.value.timestamp,
+    data: result.value.data,
+    metadata: result.value.getMetadata(),
+    getMetadata() { return this.metadata; }
+  }
+  senderWriter.write(result.value);
+
+  return ontrackPromise;
+}, 'Legacy API works');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-simulcast.https.html b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-simulcast.https.html
new file mode 100644
index 00000000000..a34f4da5a94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams-simulcast.https.html
@@ -0,0 +1,85 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCPeerConnection Insertable Streams Simulcast</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script src="../webrtc/third_party/sdp/sdp.js"></script>
+<script src="../webrtc/simulcast/simulcast.js"></script>
+<script>
+// Test based on wpt/webrtc/simulcast/basic.https.html
+promise_test(async t => {
+  const rids = [0, 1, 2];
+  const pc1 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => pc2.close());
+
+  exchangeIceCandidates(pc1, pc2);
+
+  const metadataToBeLoaded = [];
+  let receiverSSRCs = []
+  pc2.ontrack = t.step_func(e => {
+    const receiverTransformer = new TransformStream({
+      async transform(chunk, controller) {
+        let ssrc = chunk.getMetadata().synchronizationSource;
+        if (receiverSSRCs.indexOf(ssrc) == -1)
+          receiverSSRCs.push(ssrc);
+        controller.enqueue(chunk);
+      }
+    });
+    const receiverStreams = e.receiver.createEncodedStreams();
+    receiverStreams.readable
+        .pipeThrough(receiverTransformer)
+        .pipeTo(receiverStreams.writable);
+
+    const stream = e.streams[0];
+    const v = document.createElement('video');
+    v.autoplay = true;
+    v.srcObject = stream;
+    v.id = stream.id
+    metadataToBeLoaded.push(new Promise((resolve) => {
+        v.addEventListener('loadedmetadata', () => {
+            resolve();
+        });
+    }));
+  });
+
+  const stream = await navigator.mediaDevices.getUserMedia({video: {width: 1280, height: 720}});
+  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+  const transceiver = pc1.addTransceiver(stream.getVideoTracks()[0], {
+    streams: [stream],
+    sendEncodings: rids.map(rid => {rid}),
+  });
+  const senderStreams = transceiver.sender.createEncodedStreams();
+  let senderSSRCs = [];
+  const senderTransformer = new TransformStream({
+    async transform(chunk, controller) {
+      if (senderSSRCs.indexOf(chunk.synchronizationSource) == -1)
+        senderSSRCs.push(chunk.synchronizationSource);
+      controller.enqueue(chunk);
+    }
+  });
+  senderStreams.readable
+      .pipeThrough(senderTransformer)
+      .pipeTo(senderStreams.writable);
+
+  const offer = await pc1.createOffer();
+  await pc1.setLocalDescription(offer),
+  await pc2.setRemoteDescription({
+    type: 'offer',
+    sdp: swapRidAndMidExtensionsInSimulcastOffer(offer, rids),
+  });
+  const answer = await pc2.createAnswer();
+  await pc2.setLocalDescription(answer);
+  await pc1.setRemoteDescription({
+    type: 'answer',
+    sdp: swapRidAndMidExtensionsInSimulcastAnswer(answer, pc1.localDescription, rids),
+  });
+  assert_equals(metadataToBeLoaded.length, 3);
+  await Promise.all(metadataToBeLoaded);
+  // Ensure that frames from the 3 simulcast layers are exposed.
+  assert_equals(senderSSRCs.length, 3);
+  assert_equals(receiverSSRCs.length, 3);
+}, 'Basic simulcast setup with three spatial layers');
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.https.html b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.https.html
new file mode 100644
index 00000000000..de225d50899
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.https.html
@@ -0,0 +1,417 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>RTCPeerConnection Insertable Streams</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../webrtc/RTCPeerConnection-helper.js"></script>
+<script src="./RTCPeerConnection-insertable-streams.js"></script>
+</head>
+<body>
+<script>
+async function testVideoFlow(t, negotiationFunction) {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const videoTrack = stream.getVideoTracks()[0];
+  t.add_cleanup(() => videoTrack.stop());
+
+  const videoSender = caller.addTrack(videoTrack)
+  const senderStreams = videoSender.createEncodedStreams();
+  const senderReader = senderStreams.readable.getReader();
+  const senderWriter = senderStreams.writable.getWriter();
+
+  const frameInfos = [];
+  const numFramesPassthrough = 5;
+  const numFramesReplaceData = 5;
+  const numFramesModifyData = 5;
+  const numFramesToSend = numFramesPassthrough + numFramesReplaceData + numFramesModifyData;
+
+  const ontrackPromise = new Promise(resolve => {
+    callee.ontrack = t.step_func(() => {
+      const videoReceiver = callee.getReceivers().find(r => r.track.kind === 'video');
+      assert_true(videoReceiver !== undefined);
+
+      const receiverStreams =
+          videoReceiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      const receiverWriter = receiverStreams.writable.getWriter();
+
+      const maxFramesToReceive = numFramesToSend;
+      let numVerifiedFrames = 0;
+      for (let i = 0; i < maxFramesToReceive; i++) {
+        receiverReader.read().then(t.step_func(result => {
+          verifyNonstandardAdditionalDataIfPresent(result.value);
+          if (frameInfos[numVerifiedFrames] &&
+              areFrameInfosEqual(result.value, frameInfos[numVerifiedFrames])) {
+            numVerifiedFrames++;
+          } else {
+            // Receiving unexpected frames is an indication that
+            // frames are not passed correctly between sender and receiver.
+            assert_unreached("Incorrect frame received");
+          }
+
+          if (numVerifiedFrames == numFramesToSend)
+            resolve();
+        }));
+      }
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await negotiationFunction(caller, callee);
+
+  // Pass frames as they come from the encoder.
+  for (let i = 0; i < numFramesPassthrough; i++) {
+    const result = await senderReader.read();
+    const metadata = result.value.getMetadata();
+    assert_true(containsVideoMetadata(metadata));
+    verifyNonstandardAdditionalDataIfPresent(result.value);
+    frameInfos.push({
+      timestamp: result.value.timestamp,
+      type: result.value.type,
+      data: result.value.data,
+      metadata: metadata,
+      getMetadata() { return this.metadata; }
+    });
+    senderWriter.write(result.value);
+  }
+
+  // Replace frame data with arbitrary buffers.
+  for (let i = 0; i < numFramesReplaceData; i++) {
+    const result = await senderReader.read();
+    const metadata = result.value.getMetadata();
+    assert_true(containsVideoMetadata(metadata));
+    const buffer = new ArrayBuffer(100);
+    const int8View = new Int8Array(buffer);
+    int8View.fill(i);
+
+    result.value.data = buffer;
+    frameInfos.push({
+      timestamp: result.value.timestamp,
+      type: result.value.type,
+      data: result.value.data,
+      metadata: metadata,
+      getMetadata() { return this.metadata; }
+    });
+    senderWriter.write(result.value);
+  }
+
+  // Modify frame data.
+  for (let i = 0; i < numFramesReplaceData; i++) {
+    const result = await senderReader.read();
+    const metadata = result.value.getMetadata();
+    assert_true(containsVideoMetadata(metadata));
+    const int8View = new Int8Array(result.value.data);
+    int8View.fill(i);
+
+    frameInfos.push({
+      timestamp: result.value.timestamp,
+      type: result.value.type,
+      data: result.value.data,
+      metadata: metadata,
+      getMetadata() { return this.metadata; }
+    });
+    senderWriter.write(result.value);
+  }
+
+  return ontrackPromise;
+}
+
+promise_test(async t => {
+  return testVideoFlow(t, exchangeOfferAnswer);
+}, 'Frames flow correctly using insertable streams');
+
+promise_test(async t => {
+  return testVideoFlow(t, exchangeOfferAnswerReverse);
+}, 'Frames flow correctly using insertable streams when receiver starts negotiation');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection();
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const videoTrack = stream.getVideoTracks()[0];
+  t.add_cleanup(() => videoTrack.stop());
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  const videoSender = caller.addTrack(videoTrack);
+  assert_throws_dom("InvalidStateError", () => videoSender.createEncodedStreams());
+}, 'RTCRtpSender.createEncodedStream() throws if not requested in PC configuration');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection();
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const videoTrack = stream.getVideoTracks()[0];
+  t.add_cleanup(() => videoTrack.stop());
+
+  const videoSender = caller.addTrack(videoTrack);
+  const ontrackPromise = new Promise(resolve => {
+    callee.ontrack = t.step_func(() => {
+      const videoReceiver = callee.getReceivers().find(r => r.track.kind === 'video');
+      assert_true(videoReceiver !== undefined);
+      assert_throws_dom("InvalidStateError", () => videoReceiver.createEncodedStreams());
+      resolve();
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+  return ontrackPromise;
+}, 'RTCRtpReceiver.createEncodedStream() throws if not requested in PC configuration');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const videoTrack = stream.getVideoTracks()[0];
+  t.add_cleanup(() => videoTrack.stop());
+
+  const videoSender = caller.addTrack(videoTrack)
+  const senderStreams = videoSender.createEncodedStreams();
+
+  const senderWorker = new Worker('RTCPeerConnection-sender-worker-single-frame.js')
+  senderWorker.postMessage(
+    {readableStream: senderStreams.readable},
+    [senderStreams.readable]);
+
+  let expectedFrameData = null;
+  let verifiedFrameData = false;
+  let numVerifiedFrames = 0;
+  const onmessagePromise = new Promise(resolve => {
+    senderWorker.onmessage = t.step_func(message => {
+      if (!(message.data instanceof RTCEncodedVideoFrame)) {
+        // This is the first message sent from the Worker to the test.
+        // It contains an object (not an RTCEncodedVideoFrame) with the same
+        // fields as the RTCEncodedVideoFrame to be sent in follow-up messages.
+        // These serve as expected values to validate that the
+        // RTCEncodedVideoFrame is sent correctly back to the test in the next
+        // message.
+        expectedFrameData = message.data;
+      } else {
+        // This is the frame sent by the Worker after reading it from the
+        // readable stream. The Worker sends it twice after sending the
+        // verification message.
+        assert_equals(message.data.type, expectedFrameData.type);
+        assert_equals(message.data.timestamp, expectedFrameData.timestamp);
+        assert_true(areArrayBuffersEqual(message.data.data, expectedFrameData.data));
+        assert_equals(message.data.getMetadata().synchronizationSource, expectedFrameData.metadata.synchronizationSource);
+        if (++numVerifiedFrames == 2)
+          resolve();
+      }
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  return onmessagePromise;
+}, 'RTCRtpSender readable stream transferred to a Worker and the Worker sends an RTCEncodedVideoFrame back');
+
+async function testNormalDataFlowWithInsertableStreamsForOtherKind(t, normalKind) {
+  const flowAudio = (normalKind == 'audio');
+  const pcConfig = flowAudio
+    ? {forceEncodedVideoInsertableStreams:true}
+    : {forceEncodedAudioInsertableStreams:true};
+  const caller = new RTCPeerConnection(pcConfig);
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection(pcConfig);
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia(
+    {audio: flowAudio, video: !flowAudio});
+  const track = stream.getTracks()[0];
+  t.add_cleanup(() => track.stop());
+
+  const sender = caller.addTrack(track, stream);
+  const ontrackPromise = new Promise((resolve,reject) => {
+    callee.ontrack =  t.step_func(async e => {
+      let numGetStats = 0;
+      const intervalId = window.setInterval(async ()=> {
+        let statsReport = await callee.getStats();
+        statsReport.forEach(report => {
+          if (report.type == 'inbound-rtp' &&
+              report.kind == normalKind &&
+              report.bytesReceived > 0) {
+            clearInterval(intervalId);
+            resolve();
+            return;
+          }
+        });
+        if (++numGetStats >= 60) {
+          clearInterval(intervalId);
+          reject('No bytes received.');
+          return;
+        }
+      }, 50);
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  return ontrackPromise;
+}
+
+promise_test(t => {
+  return testNormalDataFlowWithInsertableStreamsForOtherKind(t, 'audio');
+}, 'Legacy: Audio flows when insertable streams is enabled for video and disabled for audio.');
+
+promise_test(t => {
+  return testNormalDataFlowWithInsertableStreamsForOtherKind(t, 'video');
+}, 'Legacy: Video flows when insertable streams is enabled for audio and disabled for audio.');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const track = stream.getTracks()[0];
+  t.add_cleanup(() => track.stop());
+
+  const sender = caller.addTrack(track)
+  const senderStreams = sender.createEncodedStreams();
+  const senderReader = senderStreams.readable.getReader();
+  const senderWriter = senderStreams.writable.getWriter();
+  const numFramesToSend = 20;
+
+  const ontrackPromise = new Promise((resolve, reject) => {
+    callee.ontrack = async e => {
+      const receiverStreams = e.receiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+
+      let numReceivedKeyFrames = 0;
+      let numReceivedDeltaFrames = 0;
+      for (let i = 0; i < numFramesToSend; i++) {
+        const result = await receiverReader.read();
+        if (result.value.type == 'key')
+          numReceivedKeyFrames++;
+        else if (result.value.type == 'delta')
+          numReceivedDeltaFrames++;
+
+        if (numReceivedKeyFrames > 0 && numReceivedDeltaFrames > 0)
+          resolve();
+        else if (numReceivedKeyFrames + numReceivedDeltaFrames >= numFramesToSend)
+          reject();
+      }
+    }
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  let numSentKeyFrames = 0;
+  let numSentDeltaFrames = 0;
+  // Pass frames as they come from the encoder.
+  for (let i = 0; i < numFramesToSend; i++) {
+    const result = await senderReader.read();
+    verifyNonstandardAdditionalDataIfPresent(result.value);
+    if (result.value.type == 'key') {
+      numSentKeyFrames++;
+    } else {
+      numSentDeltaFrames++;
+    }
+
+    senderWriter.write(result.value);
+  }
+
+  assert_greater_than(numSentKeyFrames, 0);
+  assert_greater_than(numSentDeltaFrames, 0);
+
+  return ontrackPromise;
+}, 'Key and Delta frames are sent and received');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const track = stream.getTracks()[0];
+  t.add_cleanup(() => track.stop());
+
+  const sender = caller.addTrack(track)
+  const streams = sender.createEncodedStreams();
+  const transformer = new TransformStream({
+    transform(frame, controller) {
+      // Inserting the same frame twice will result in failure since the frame
+      // will be neutered after the first insertion is processed.
+      controller.enqueue(frame);
+      controller.enqueue(frame);
+    }
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  await promise_rejects_dom(
+      t, 'OperationError',
+      streams.readable.pipeThrough(transformer).pipeTo(streams.writable));
+}, 'Enqueuing the same frame twice fails');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection({encodedInsertableStreams:true});
+  t.add_cleanup(() => callee.close());
+
+  const stream = await navigator.mediaDevices.getUserMedia({video:true});
+  const videoTrack = stream.getVideoTracks()[0];
+  t.add_cleanup(() => videoTrack.stop());
+
+  const videoSender = caller.addTrack(videoTrack)
+  const senderStreams = videoSender.createEncodedStreams();
+  const senderReader = senderStreams.readable.getReader();
+  const senderWriter = senderStreams.writable.getWriter();
+
+  let sentFrameInfo = null;
+  const ontrackPromise = new Promise(resolve => {
+    callee.ontrack = t.step_func(async e => {
+      const videoReceiver = e.receiver;
+
+      const receiverStreams = videoReceiver.createEncodedStreams();
+      const receiverReader = receiverStreams.readable.getReader();
+      receiverReader.read().then(t.step_func(receivedResult => {
+        assert_true(areFrameInfosEqual(receivedResult.value, sentFrameInfo));
+        verifyNonstandardAdditionalDataIfPresent(receivedResult.value);
+        resolve();
+      }));
+    });
+  });
+
+  exchangeIceCandidates(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
+
+  // Pass frames as they come from the encoder.
+  const result = await senderReader.read();
+  verifyNonstandardAdditionalDataIfPresent(result.value);
+  sentFrameInfo = {
+    timestamp: result.value.timestamp,
+    type: result.value.type,
+    data: result.value.data,
+    metadata: result.value.getMetadata(),
+    getMetadata() { return this.metadata; }
+  }
+  senderWriter.write(result.value);
+
+  return ontrackPromise;
+}, 'Legacy API works');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.js b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.js
new file mode 100644
index 00000000000..87f4394b0b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-insertable-streams.js
@@ -0,0 +1,241 @@
+function areArrayBuffersEqual(buffer1, buffer2)
+{
+  if (buffer1.byteLength !== buffer2.byteLength) {
+    return false;
+  }
+  let array1 = new Int8Array(buffer1);
+  var array2 = new Int8Array(buffer2);
+  for (let i = 0 ; i < buffer1.byteLength ; ++i) {
+    if (array1[i] !== array2[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function areArraysEqual(a1, a2) {
+  if (a1 === a1)
+    return true;
+  if (a1.length != a2.length)
+    return false;
+  for (let i = 0; i < a1.length; i++) {
+    if (a1[i] != a2[i])
+      return false;
+  }
+  return true;
+}
+
+function areMetadataEqual(metadata1, metadata2, type) {
+  return metadata1.synchronizationSource === metadata2.synchronizationSource &&
+         areArraysEqual(metadata1.contributingSources, metadata2.contributingSources) &&
+         metadata1.frameId === metadata2.frameId &&
+         areArraysEqual(metadata1.dependencies, metadata2.dependencies) &&
+         metadata1.spatialIndex === metadata2.spatialIndex &&
+         metadata1.temporalIndex === metadata2.temporalIndex &&
+         // Width and height are reported only for key frames on the receiver side.
+         type == "key"
+           ? metadata1.width === metadata2.width && metadata1.height === metadata2.height
+           : true;
+}
+
+function areFrameInfosEqual(frame1, frame2) {
+  return frame1.timestamp === frame2.timestamp &&
+         frame1.type === frame2.type &&
+         areMetadataEqual(frame1.getMetadata(), frame2.getMetadata(), frame1.type) &&
+         areArrayBuffersEqual(frame1.data, frame2.data);
+}
+
+function containsVideoMetadata(metadata) {
+  return metadata.synchronizationSource !== undefined &&
+         metadata.width !== undefined &&
+         metadata.height !== undefined &&
+         metadata.spatialIndex !== undefined &&
+         metadata.temporalIndex !== undefined &&
+         metadata.dependencies !== undefined;
+}
+
+function enableGFD(sdp) {
+  const GFD_V00_EXTENSION =
+      'http://www.webrtc.org/experiments/rtp-hdrext/generic-frame-descriptor-00';
+  if (sdp.indexOf(GFD_V00_EXTENSION) !== -1)
+    return sdp;
+
+  const extensionIds = sdp.trim().split('\n')
+    .map(line => line.trim())
+    .filter(line => line.startsWith('a=extmap:'))
+    .map(line => line.split(' ')[0].substr(9))
+    .map(id => parseInt(id, 10))
+    .sort((a, b) => a - b);
+  for (let newId = 1; newId <= 14; newId++) {
+    if (!extensionIds.includes(newId)) {
+      return sdp += 'a=extmap:' + newId + ' ' + GFD_V00_EXTENSION + '\r\n';
+    }
+  }
+  if (sdp.indexОf('a=extmap-allow-mixed') !== -1) { // Pick the next highest one.
+    const newId = extensionIds[extensionIds.length - 1] + 1;
+    return sdp += 'a=extmap:' + newId + ' ' + GFD_V00_EXTENSION + '\r\n';
+  }
+  throw 'Could not find free extension id to use for ' + GFD_V00_EXTENSION;
+}
+
+async function exchangeOfferAnswer(pc1, pc2) {
+  const offer = await pc1.createOffer();
+  // Munge the SDP to enable the GFD extension in order to get correct metadata.
+  const sdpGFD = enableGFD(offer.sdp);
+  await pc1.setLocalDescription({type: offer.type, sdp: sdpGFD});
+  // Munge the SDP to disable bandwidth probing via RTX.
+  // TODO(crbug.com/1066819): remove this hack when we do not receive duplicates from RTX
+  // anymore.
+  const sdpRTX = sdpGFD.replace(new RegExp('rtx', 'g'), 'invalid');
+  await pc2.setRemoteDescription({type: 'offer', sdp: sdpRTX});
+
+  const answer = await pc2.createAnswer();
+  await pc2.setLocalDescription(answer);
+  await pc1.setRemoteDescription(answer);
+}
+
+async function exchangeOfferAnswerReverse(pc1, pc2) {
+  const offer = await pc2.createOffer({offerToReceiveAudio: true, offerToReceiveVideo: true});
+  // Munge the SDP to enable the GFD extension in order to get correct metadata.
+  const sdpGFD = enableGFD(offer.sdp);
+  // Munge the SDP to disable bandwidth probing via RTX.
+  // TODO(crbug.com/1066819): remove this hack when we do not receive duplicates from RTX
+  // anymore.
+  const sdpRTX = sdpGFD.replace(new RegExp('rtx', 'g'), 'invalid');
+  await pc1.setRemoteDescription({type: 'offer', sdp: sdpRTX});
+  await pc2.setLocalDescription({type: 'offer', sdp: sdpGFD});
+
+  const answer = await pc1.createAnswer();
+  await pc2.setRemoteDescription(answer);
+  await pc1.setLocalDescription(answer);
+}
+
+function createFrameDescriptor(videoFrame) {
+  const kMaxSpatialLayers = 8;
+  const kMaxTemporalLayers = 8;
+  const kMaxNumFrameDependencies = 8;
+
+  const metadata = videoFrame.getMetadata();
+  let frameDescriptor = {
+    beginningOfSubFrame: true,
+    endOfSubframe: false,
+    frameId: metadata.frameId & 0xFFFF,
+    spatialLayers: 1 << metadata.spatialIndex,
+    temporalLayer: metadata.temporalLayer,
+    frameDependenciesDiffs: [],
+    width: 0,
+    height: 0
+  };
+
+  for (const dependency of metadata.dependencies) {
+    frameDescriptor.frameDependenciesDiffs.push(metadata.frameId - dependency);
+  }
+  if (metadata.dependencies.length == 0) {
+    frameDescriptor.width = metadata.width;
+    frameDescriptor.height = metadata.height;
+  }
+  return frameDescriptor;
+}
+
+function additionalDataSize(descriptor) {
+  if (!descriptor.beginningOfSubFrame) {
+    return 1;
+  }
+
+  let size = 4;
+  for (const fdiff of descriptor.frameDependenciesDiffs) {
+    size += (fdiff >= (1 << 6)) ? 2 : 1;
+  }
+  if (descriptor.beginningOfSubFrame &&
+      descriptor.frameDependenciesDiffs.length == 0 &&
+      descriptor.width > 0 &&
+      descriptor.height > 0) {
+    size += 4;
+  }
+
+  return size;
+}
+
+// Compute the buffer reported in the additionalData field using the metadata
+// provided by a video frame.
+// Based on the webrtc::RtpDescriptorAuthentication() C++ function at
+// https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/modules/rtp_rtcp/source/rtp_descriptor_authentication.cc
+function computeAdditionalData(videoFrame) {
+  const kMaxSpatialLayers = 8;
+  const kMaxTemporalLayers = 8;
+  const kMaxNumFrameDependencies = 8;
+
+  const metadata = videoFrame.getMetadata();
+  if (metadata.spatialIndex < 0 ||
+      metadata.temporalIndex < 0 ||
+      metadata.spatialIndex >= kMaxSpatialLayers ||
+      metadata.temporalIndex >= kMaxTemporalLayers ||
+      metadata.dependencies.length > kMaxNumFrameDependencies) {
+    return new ArrayBuffer(0);
+  }
+
+  const descriptor = createFrameDescriptor(videoFrame);
+  const size = additionalDataSize(descriptor);
+  const additionalData = new ArrayBuffer(size);
+  const data = new Uint8Array(additionalData);
+
+  const kFlagBeginOfSubframe = 0x80;
+  const kFlagEndOfSubframe = 0x40;
+  const kFlagFirstSubframeV00 = 0x20;
+  const kFlagLastSubframeV00 = 0x10;
+
+  const kFlagDependencies = 0x08;
+  const kFlagMoreDependencies = 0x01;
+  const kFlageXtendedOffset = 0x02;
+
+  let baseHeader =
+    (descriptor.beginningOfSubFrame ? kFlagBeginOfSubframe : 0) |
+    (descriptor.endOfSubFrame ? kFlagEndOfSubframe : 0);
+  baseHeader |= kFlagFirstSubframeV00;
+  baseHeader |= kFlagLastSubframeV00;
+
+  if (!descriptor.beginningOfSubFrame) {
+    data[0] = baseHeader;
+    return additionalData;
+  }
+
+  data[0] =
+      baseHeader |
+      (descriptor.frameDependenciesDiffs.length == 0 ? 0 : kFlagDependencies) |
+      descriptor.temporalLayer;
+  data[1] = descriptor.spatialLayers;
+  data[2] = descriptor.frameId & 0xFF;
+  data[3] = descriptor.frameId >> 8;
+
+  const fdiffs = descriptor.frameDependenciesDiffs;
+  let offset = 4;
+  if (descriptor.beginningOfSubFrame &&
+      fdiffs.length == 0 &&
+      descriptor.width > 0 &&
+      descriptor.height > 0) {
+    data[offset++] = (descriptor.width >> 8);
+    data[offset++] = (descriptor.width & 0xFF);
+    data[offset++] = (descriptor.height >> 8);
+    data[offset++] = (descriptor.height & 0xFF);
+  }
+  for (let i = 0; i < fdiffs.length; i++) {
+    const extended = fdiffs[i] >= (1 << 6);
+    const more = i < fdiffs.length - 1;
+    data[offset++] = ((fdiffs[i] & 0x3f) << 2) |
+                     (extended ? kFlageXtendedOffset : 0) |
+                     (more ? kFlagMoreDependencies : 0);
+    if (extended) {
+      data[offset++] = fdiffs[i] >> 6;
+    }
+  }
+  return additionalData;
+}
+
+function verifyNonstandardAdditionalDataIfPresent(videoFrame) {
+  if (videoFrame.additionalData === undefined)
+    return;
+
+  const computedData = computeAdditionalData(videoFrame);
+  assert_true(areArrayBuffersEqual(videoFrame.additionalData, computedData));
+}
+
diff --git a/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-sender-worker-single-frame.js b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-sender-worker-single-frame.js
new file mode 100644
index 00000000000..c943dafe5b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc-insertable-streams/RTCPeerConnection-sender-worker-single-frame.js
@@ -0,0 +1,19 @@
+onmessage = async (event) => {
+  const readableStream = event.data.readableStream;
+  const reader = readableStream.getReader();
+  const result = await reader.read();
+
+  // Post an object with individual fields so that the test side has
+  // values to verify the serialization of the RTCEncodedVideoFrame.
+  postMessage({
+    type: result.value.type,
+    timestamp: result.value.timestamp,
+    data: result.value.data,
+    metadata: result.value.getMetadata(),
+  });
+
+  // Send the frame twice to verify that the frame does not change after the
+  // first serialization.
+  postMessage(result.value);
+  postMessage(result.value);
+}
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceCandidate-constructor.html b/tests/wpt/web-platform-tests/webrtc/RTCIceCandidate-constructor.html
index 6c208e887f4..66d69620796 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCIceCandidate-constructor.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCIceCandidate-constructor.html
@@ -172,7 +172,7 @@
     assert_equals(candidate.protocol, 'udp', 'protocol');
     assert_equals(candidate.port, 58041, 'port');
     assert_equals(candidate.type, 'host', 'type');
-    assert_equals(candidate.tcpType, '', 'tcpType');
+    assert_equals(candidate.tcpType, null, 'tcpType');
     assert_equals(candidate.relatedAddress, null, 'relatedAddress');
     assert_equals(candidate.relatedPort, null, 'relatedPort');
   }, 'new RTCIceCandidate({ ... }) with nondefault values for all fields');
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html
new file mode 100644
index 00000000000..6c97afe94ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-candidate-in-sdp.https.html
@@ -0,0 +1,26 @@
+<!doctype html>
+<meta charset=utf-8>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+'use strict';
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  let resolveIceCandidatePromise = null;
+  const iceCandidatePromise = new Promise(r => resolveIceCandidatePromise = r);
+  pc.onicecandidate = e => {
+    resolveIceCandidatePromise(pc.localDescription.sdp);
+    pc.onicecandidate = null;
+  }
+  pc.addTransceiver("audio");
+  await pc.setLocalDescription(await pc.createOffer());
+  assert_false(pc.localDescription.sdp.includes("a=candidate:"),
+               "localDescription is missing candidate before onicecandidate");
+  // The localDescription at the time of the onicecandidate event.
+  const localDescriptionSdp = await iceCandidatePromise;
+  assert_true(localDescriptionSdp.includes("a=candidate:"),
+               "localDescription contains candidate after onicecandidate");
+}, 'localDescription contains candidates');
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html
new file mode 100644
index 00000000000..2d2565c3e1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-description-attributes-timing.https.html
@@ -0,0 +1,81 @@
+<!doctype html>
+<meta charset=utf-8>
+<title></title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+'use strict';
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const offer = await pc.createOffer();
+
+  assert_equals(pc.pendingLocalDescription, null,
+                'pendingLocalDescription is null before setLocalDescription');
+  const promise = pc.setLocalDescription(offer);
+  assert_equals(pc.pendingLocalDescription, null,
+                'pendingLocalDescription is still null while promise pending');
+  await promise;
+  assert_not_equals(pc.pendingLocalDescription, null,
+                    'pendingLocalDescription is not null after await');
+}, "pendingLocalDescription is surfaced at the right time");
+
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  t.add_cleanup(() => pc.close());
+  const offer = await pc.createOffer();
+
+  assert_equals(pc.pendingRemoteDescription, null,
+                'pendingRemoteDescription is null before setRemoteDescription');
+  const promise = pc.setRemoteDescription(offer);
+  assert_equals(pc.pendingRemoteDescription, null,
+                'pendingRemoteDescription is still null while promise pending');
+  await promise;
+  assert_not_equals(pc.pendingRemoteDescription, null,
+                    'pendingRemoteDescription is not null after await');
+}, "pendingRemoteDescription is surfaced at the right time");
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  const offer = await pc1.createOffer();
+  await pc1.setLocalDescription(offer);
+  await pc2.setRemoteDescription(offer);
+  const answer = await pc2.createAnswer();
+
+  assert_equals(pc2.currentLocalDescription, null,
+                'currentLocalDescription is null before setLocalDescription');
+  const promise = pc2.setLocalDescription(answer);
+  assert_equals(pc2.currentLocalDescription, null,
+                'currentLocalDescription is still null while promise pending');
+  await promise;
+  assert_not_equals(pc2.currentLocalDescription, null,
+                    'currentLocalDescription is not null after await');
+}, "currentLocalDescription is surfaced at the right time");
+
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  const offer = await pc1.createOffer();
+  await pc1.setLocalDescription(offer);
+  await pc2.setRemoteDescription(offer);
+  const answer = await pc2.createAnswer();
+
+  assert_equals(pc1.currentRemoteDescription, null,
+                'currentRemoteDescription is null before setRemoteDescription');
+  const promise = pc1.setRemoteDescription(answer);
+  assert_equals(pc1.currentRemoteDescription, null,
+                'currentRemoteDescription is still null while promise pending');
+  await promise;
+  assert_not_equals(pc1.currentRemoteDescription, null,
+                    'currentRemoteDescription is not null after await');
+}, "currentRemoteDescription is surfaced at the right time");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
index 2d91e5f5837..5aef0a8e21e 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-helper.js
@@ -398,7 +398,7 @@ const trackFactories = {
     return dst.stream.getAudioTracks()[0];
   },
 
-  video({width = 640, height = 480, signal = null} = {}) {
+  video({width = 640, height = 480, signal} = {}) {
     const canvas = Object.assign(
       document.createElement("canvas"), {width, height}
     );
@@ -406,15 +406,17 @@ const trackFactories = {
     const stream = canvas.captureStream();
 
     let count = 0;
-    setInterval(() => {
+    const interval = setInterval(() => {
       ctx.fillStyle = `rgb(${count%255}, ${count*count%255}, ${count%255})`;
       count += 1;
       ctx.fillRect(0, 0, width, height);
-      // If signal is set, add a constant-color box to the video frame
-      // at coordinates 10 to 30 in both X and Y direction.
-      if (signal !== null) {
+      // If signal is set (0-255), add a constant-color box of that luminance to
+      // the video frame at coordinates 20 to 60 in both X and Y direction.
+      // (big enough to avoid color bleed from surrounding video in some codecs,
+      // for more stable tests).
+      if (signal != undefined) {
         ctx.fillStyle = `rgb(${signal}, ${signal}, ${signal})`;
-        ctx.fillRect(10, 10, 20, 20);
+        ctx.fillRect(20, 20, 40, 40);
       }
     }, 100);
 
@@ -423,25 +425,34 @@ const trackFactories = {
     } else {
       document.addEventListener('DOMContentLoaded', () => {
         document.body.appendChild(canvas);
-      });
+      }, {once: true});
     }
 
-    return stream.getVideoTracks()[0];
+    // Implement track.stop() for performance in some tests on some platforms
+    const track = stream.getVideoTracks()[0];
+    const nativeStop = track.stop;
+    track.stop = function stop() {
+      clearInterval(interval);
+      nativeStop.apply(this);
+      if (document.body && canvas.parentElement == document.body) {
+        document.body.removeChild(canvas);
+      }
+    };
+    return track;
   }
 };
 
 // Get the signal from a video element inserted by createNoiseStream
 function getVideoSignal(v) {
-  if (v.videoWidth < 21 || v.videoHeight < 21) {
-    return null;
+  if (v.videoWidth < 60 || v.videoHeight < 60) {
+    throw new Error('getVideoSignal: video too small for test');
   }
   const canvas = document.createElement("canvas");
-  canvas.width = v.videoWidth;
-  canvas.height = v.videoHeight;
+  canvas.width = canvas.height = 60;
   const context = canvas.getContext('2d');
-  context.drawImage(v, 0, 0, v.videoWidth, v.videoHeight);
-  // Extract pixel value at position 20, 20
-  const pixel = context.getImageData(20, 20, 1, 1);
+  context.drawImage(v, 0, 0);
+  // Extract pixel value at position 40, 40
+  const pixel = context.getImageData(40, 40, 1, 1);
   // Use luma reconstruction to get back original value according to
   // ITU-R rec BT.709
   return (pixel.data[0] * 0.21 + pixel.data[1] * 0.72 + pixel.data[2] * 0.07);
@@ -449,8 +460,9 @@ function getVideoSignal(v) {
 
 async function detectSignal(t, v, value) {
   while (true) {
-    const signal = getVideoSignal(v);
-    if (signal !== null && signal < value + 1 && signal > value - 1) {
+    const signal = getVideoSignal(v).toFixed();
+    // allow off-by-two pixel error (observed in some implementations)
+    if (value - 2 <= signal && signal <= value + 2) {
       return;
     }
     // We would like to wait for each new frame instead here,
@@ -527,8 +539,12 @@ async function exchangeOffer(caller, callee) {
 }
 // Performs an answer exchange caller -> callee.
 async function exchangeAnswer(caller, callee) {
-  await callee.setLocalDescription(await callee.createAnswer());
-  await caller.setRemoteDescription(callee.localDescription);
+  // Note that caller's remote description must be set first; if not,
+  // there's a chance that candidates from callee arrive at caller before
+  // it has a remote description to apply them to.
+  const answer = await callee.createAnswer();
+  await caller.setRemoteDescription(answer);
+  await callee.setLocalDescription(answer);
 }
 async function exchangeOfferAnswer(caller, callee) {
   await exchangeOffer(caller, callee);
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html
index 88acf348eb5..e7d8f220e66 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-iceGatheringState.html
@@ -133,17 +133,21 @@
     await initialOfferAnswerWithIceGatheringStateTransitions(
         pc1, pc2, {offerToReceiveAudio: true});
 
+    const pc1waiter = iceGatheringStateTransitions(pc1, 'new');
+    const pc2waiter = iceGatheringStateTransitions(pc2, 'new');
     pc1.getTransceivers()[0].stop();
     await pc1.setLocalDescription(await pc1.createOffer());
     await pc2.setRemoteDescription(pc1.localDescription);
     await pc2.setLocalDescription(await pc2.createAnswer());
     assert_equals(pc2.getTransceivers().length, 0,
                  'PC2 transceivers should be invisible after negotiation');
-    await iceGatheringStateTransitions(pc2, 'new');
+    assert_equals(pc2.iceGatheringState, 'new');
+    await pc2waiter;
     await pc1.setRemoteDescription(pc2.localDescription);
     assert_equals(pc1.getTransceivers().length, 0,
-                 'PC1 transceivers should be invisible after negotiation');
-    await iceGatheringStateTransitions(pc1, 'new');
+                  'PC1 transceivers should be invisible after negotiation');
+    assert_equals(pc1.iceGatheringState, 'new');
+    await pc1waiter;
   }, 'renegotiation that closes all transports should result in ICE gathering state "new"');
 
   /*
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html
index 5b0d59153dc..50158d4cea0 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-mandatory-getStats.https.html
@@ -203,9 +203,6 @@ async function getAllStats(t, pc) {
   return stats;
 }
 
-let succeed;
-const success = new Promise(r => succeed = r);
-
 promise_test(async t => {
   const pc1 = new RTCPeerConnection();
   t.add_cleanup(() => pc1.close());
@@ -229,39 +226,40 @@ promise_test(async t => {
   // accessible metric of implementation progress by dictionary member. We count
   // whether we've seen each dictionary's mandatory members in getStats().
 
-  for (const stat of stats.values()) {
-    let dictName = dictionaryNames[stat.type];
-    if (!dictName) continue;
-    if (typeof dictName == "object") {
-      dictName = dictName[stat.kind];
-    }
-    assert_equals(typeof dictName, "string", "Test error. String.");
-    if (dictName && mandatory[dictName]) {
-      do {
-        const memberNames = mandatory[dictName];
-        const remainingNames = remaining[dictName];
-        assert_true(memberNames.length > 0, "Test error. Parent not found.");
-        for (const memberName of memberNames) {
-          if (memberName in stat) {
-            assert_not_equals(stat[memberName], undefined, "Not undefined");
-            remainingNames.delete(memberName);
+  test(t => {
+    for (const stat of stats.values()) {
+      let dictName = dictionaryNames[stat.type];
+      if (!dictName) continue;
+      if (typeof dictName == "object") {
+        dictName = dictName[stat.kind];
+      }
+
+      assert_equals(typeof dictName, "string", "Test error. String.");
+      if (dictName && mandatory[dictName]) {
+        do {
+          const memberNames = mandatory[dictName];
+          const remainingNames = remaining[dictName];
+          assert_true(memberNames.length > 0, "Test error. Parent not found.");
+          for (const memberName of memberNames) {
+            if (memberName in stat) {
+              assert_not_equals(stat[memberName], undefined, "Not undefined");
+              remainingNames.delete(memberName);
+            }
           }
-        }
-        dictName = parents[dictName];
-      } while (dictName);
+          dictName = parents[dictName];
+        } while (dictName);
+      }
+    }
+  }, "Validating stats");
+
+  for (const dictName in mandatory) {
+    for (const memberName of mandatory[dictName]) {
+      test(t => {
+        assert_true(!remaining[dictName].has(memberName),
+                    `Is ${memberName} present`);
+      }, `${dictName}'s ${memberName}`);
     }
   }
-  succeed();
 }, 'getStats succeeds');
 
-for (const dictName in mandatory) {
-  for (const memberName of mandatory[dictName]) {
-    promise_test(async t => {
-      await success;
-      assert_true(!remaining[dictName].has(memberName),
-                  `Is ${memberName} present`);
-    }, `${dictName}'s ${memberName}`);
-  }
-}
-
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html
index 0c8405770b6..fa096c1fb60 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-onsignalingstatechanged.https.html
@@ -53,4 +53,19 @@ promise_test(async t => {
   await new Promise(r => t.step_timeout(r, 100));
 }, 'Closing a PeerConnection should not fire signalingstatechange event');
 
+promise_test(async t => {
+  const pc1 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
+  const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc2.close());
+
+  pc2.addTransceiver('video');
+
+  pc1.ontrack = t.unreached_func();
+  pc1.onsignalingstatechange = t.step_func(e => {
+    pc1.ontrack = null;
+  });
+  await pc1.setRemoteDescription(await pc2.createOffer());
+}, 'signalingstatechange is the first event to fire');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js
new file mode 100644
index 00000000000..28c476ec409
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-helper.js
@@ -0,0 +1,151 @@
+'use strict'
+
+function peer(other, polite, fail = null) {
+  const send = (tgt, msg) => tgt.postMessage(JSON.parse(JSON.stringify(msg)),
+                                             "*");
+  if (!fail) fail = e => send(window.parent, {error: `${e.name}: ${e.message}`});
+  const pc = new RTCPeerConnection();
+
+  if (!window.assert_equals) {
+    window.assert_equals = (a, b, msg) => a === b ||
+        fail(new Error(`${msg} expected ${b} but got ${a}`));
+  }
+
+  const commands = {
+    async addTransceiver() {
+      const transceiver = pc.addTransceiver("video");
+      await new Promise(r => pc.addEventListener("negotiated", r, {once: true}));
+      if (!transceiver.currentDirection) {
+        // Might have just missed the negotiation train. Catch next one.
+        await new Promise(r => pc.addEventListener("negotiated", r, {once: true}));
+      }
+      assert_equals(transceiver.currentDirection, "sendonly", "have direction");
+      return pc.getTransceivers().length;
+    },
+    async simpleConnect() {
+      const p = commands.addTransceiver();
+      await new Promise(r => pc.oniceconnectionstatechange =
+                        () => pc.iceConnectionState == "connected" && r());
+      return await p;
+    },
+    async getNumTransceivers() {
+      return pc.getTransceivers().length;
+    },
+  };
+
+  try {
+    pc.addEventListener("icecandidate", ({candidate}) => send(other,
+                                                              {candidate}));
+    let makingOffer = false, ignoreOffer = false;
+    let srdAnswerPending = false;
+    pc.addEventListener("negotiationneeded", async () => {
+      try {
+        assert_equals(pc.signalingState, "stable", "negotiationneeded always fires in stable state");
+        assert_equals(makingOffer, false, "negotiationneeded not already in progress");
+        makingOffer = true;
+        await pc.setLocalDescription();
+        assert_equals(pc.signalingState, "have-local-offer", "negotiationneeded not racing with onmessage");
+        assert_equals(pc.localDescription.type, "offer", "negotiationneeded SLD worked");
+        send(other, {description: pc.localDescription});
+      } catch (e) {
+        fail(e);
+      } finally {
+        makingOffer = false;
+      }
+    });
+    window.onmessage = async ({data: {description, candidate, run}}) => {
+      try {
+        if (description) {
+          // If we have a setRemoteDescription() answer operation pending, then
+          // we will be "stable" by the time the next setRemoteDescription() is
+          // executed, so we count this being stable when deciding whether to
+          // ignore the offer.
+          let isStable =
+              pc.signalingState == "stable" ||
+              (pc.signalingState == "have-local-offer" && srdAnswerPending);
+          ignoreOffer = description.type == "offer" && !polite &&
+                         (makingOffer || !isStable);
+          if (ignoreOffer) {
+            return;
+          }
+          if (description.type == "answer")
+            srdAnswerPending = true;
+          await pc.setRemoteDescription(description);
+          srdAnswerPending = false;
+          if (description.type == "offer") {
+            assert_equals(pc.signalingState, "have-remote-offer", "Remote offer");
+            assert_equals(pc.remoteDescription.type, "offer", "SRD worked");
+            await pc.setLocalDescription();
+            assert_equals(pc.signalingState, "stable", "onmessage not racing with negotiationneeded");
+            assert_equals(pc.localDescription.type, "answer", "onmessage SLD worked");
+            send(other, {description: pc.localDescription});
+          } else {
+            assert_equals(pc.remoteDescription.type, "answer", "Answer was set");
+            assert_equals(pc.signalingState, "stable", "answered");
+            pc.dispatchEvent(new Event("negotiated"));
+          }
+        } else if (candidate) {
+          try {
+            await pc.addIceCandidate(candidate);
+          } catch (e) {
+            if (!ignoreOffer) throw e;
+          }
+        } else if (run) {
+          send(window.parent, {[run.id]: await commands[run.cmd]() || 0});
+        }
+      } catch (e) {
+        fail(e);
+      }
+    };
+  } catch (e) {
+    fail(e);
+  }
+  return pc;
+}
+
+async function setupPeerIframe(t, polite) {
+  const iframe = document.createElement("iframe");
+  t.add_cleanup(() => iframe.remove());
+  iframe.srcdoc =
+   `<html\><script\>(${peer.toString()})(window.parent, ${polite});</script\></html\>`;
+  document.documentElement.appendChild(iframe);
+
+  const failCatcher = t.step_func(({data}) =>
+      ("error" in data) && assert_unreached(`Error in iframe: ${data.error}`));
+  window.addEventListener("message", failCatcher);
+  t.add_cleanup(() => window.removeEventListener("message", failCatcher));
+  await new Promise(r => iframe.onload = r);
+  return iframe;
+}
+
+function setupPeerTopLevel(t, other, polite) {
+  const pc = peer(other, polite, t.step_func(e => { throw e; }));
+  t.add_cleanup(() => { pc.close(); window.onmessage = null; });
+}
+
+let counter = 0;
+async function run(target, cmd) {
+  const id = `result${counter++}`;
+  target.postMessage({run: {cmd, id}}, "*");
+  return new Promise(r => window.addEventListener("message",
+                                                  function listen({data}) {
+    if (!(id in data)) return;
+    window.removeEventListener("message", listen);
+    r(data[id]);
+  }));
+}
+
+let iframe;
+async function setupAB(t, politeA, politeB) {
+  iframe = await setupPeerIframe(t, politeB);
+  return setupPeerTopLevel(t, iframe.contentWindow, politeA);
+}
+const runA = cmd => run(window, cmd);
+const runB = cmd => run(iframe.contentWindow, cmd);
+const runBoth = (cmdA, cmdB = cmdA) => Promise.all([runA(cmdA), runB(cmdB)]);
+
+async function promise_test_both_roles(f, name) {
+  promise_test(async t => f(t, await setupAB(t, true, false)), name);
+  promise_test(async t => f(t, await setupAB(t, false, true)),
+               `${name} with roles reversed`);
+}
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html
new file mode 100644
index 00000000000..cf8bdf22e2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare-linear.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title></title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="RTCPeerConnection-perfect-negotiation-helper.js"></script>
+<script>
+'use strict';
+
+promise_test_both_roles(async (t, pc) => {
+  const ps = [];
+  for (let i = 10; i > 0; i--) {
+    ps.push(runBoth("addTransceiver"));
+    await new Promise(r => t.step_timeout(r, 0));
+  }
+  ps.push(runBoth("addTransceiver"));
+  await Promise.all(ps);
+  const [numA, numB] = await runBoth("getNumTransceivers");
+  assert_equals(numA, 22, "22 transceivers on side A");
+  assert_equals(numB, 22, "22 transceivers on side B");
+}, "Perfect negotiation stress glare linear");
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html
new file mode 100644
index 00000000000..6134eb20063
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation-stress-glare.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<meta charset=utf-8>
+<meta name="timeout" content="long">
+<title></title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="RTCPeerConnection-perfect-negotiation-helper.js"></script>
+<script>
+'use strict';
+
+promise_test_both_roles(async (t, pc) => {
+  const ps = [];
+  for (let i = 10; i > 0; i--) {
+    ps.push(runBoth("addTransceiver"));
+    await new Promise(r => t.step_timeout(r, i - 1));
+  }
+  ps.push(runBoth("addTransceiver"));
+  await Promise.all(ps);
+  const [numA, numB] = await runBoth("getNumTransceivers");
+  assert_equals(numA, 22, "22 transceivers on side A");
+  assert_equals(numB, 22, "22 transceivers on side B");
+}, "Perfect negotiation stress glare");
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html
index ad2725c33ca..d01b1161626 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-perfect-negotiation.https.html
@@ -4,148 +4,10 @@
 <title></title>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
+<script src="RTCPeerConnection-perfect-negotiation-helper.js"></script>
 <script>
 'use strict';
 
-function peer(other, polite, fail = null) {
-  const send = (tgt, msg) => tgt.postMessage(JSON.parse(JSON.stringify(msg)),
-                                             "*");
-  if (!fail) fail = e => send(window.parent, {error: `${e.name}: ${e.message}`});
-  const pc = new RTCPeerConnection();
-
-  if (!window.assert_equals) {
-    window.assert_equals = (a, b, msg) => a === b ||
-        fail(new Error(`${msg} expected ${b} but got ${a}`));
-  }
-
-  const commands = {
-    async addTransceiver() {
-      const transceiver = pc.addTransceiver("video");
-      await new Promise(r => pc.addEventListener("negotiated", r, {once: true}));
-      if (!transceiver.currentDirection) {
-        // Might have just missed the negotiation train. Catch next one.
-        await new Promise(r => pc.addEventListener("negotiated", r, {once: true}));
-      }
-      assert_equals(transceiver.currentDirection, "sendonly", "have direction");
-      return pc.getTransceivers().length;
-    },
-    async simpleConnect() {
-      const p = commands.addTransceiver();
-      await new Promise(r => pc.oniceconnectionstatechange =
-                        () => pc.iceConnectionState == "connected" && r());
-      return await p;
-    },
-    async getNumTransceivers() {
-      return pc.getTransceivers().length;
-    },
-  };
-
-  try {
-    pc.addEventListener("icecandidate", ({candidate}) => send(other,
-                                                              {candidate}));
-    let makingOffer = false, ignoreOffer = false;
-    pc.addEventListener("negotiationneeded", async () => {
-      try {
-        assert_equals(pc.signalingState, "stable", "negotiationneeded always fires in stable state");
-        assert_equals(makingOffer, false, "negotiationneeded not already in progress");
-        makingOffer = true;
-        await pc.setLocalDescription();
-        assert_equals(pc.signalingState, "have-local-offer", "negotiationneeded not racing with onmessage");
-        assert_equals(pc.localDescription.type, "offer", "negotiationneeded SLD worked");
-        send(other, {description: pc.localDescription});
-      } catch (e) {
-        fail(e);
-      } finally {
-        makingOffer = false;
-      }
-    });
-    window.onmessage = async ({data: {description, candidate, run}}) => {
-      try {
-        if (description) {
-          ignoreOffer = description.type == "offer" && !polite &&
-                         (makingOffer || pc.signalingState != "stable");
-          if (ignoreOffer) {
-            return;
-          }
-          await pc.setRemoteDescription(description);
-          if (description.type == "offer") {
-            assert_equals(pc.signalingState, "have-remote-offer", "Remote offer");
-            assert_equals(pc.remoteDescription.type, "offer", "SRD worked");
-            await pc.setLocalDescription();
-            assert_equals(pc.signalingState, "stable", "onmessage not racing with negotiationneeded");
-            assert_equals(pc.localDescription.type, "answer", "onmessage SLD worked");
-            send(other, {description: pc.localDescription});
-          } else {
-            assert_equals(pc.remoteDescription.type, "answer", "Answer was set");
-            assert_equals(pc.signalingState, "stable", "answered");
-            pc.dispatchEvent(new Event("negotiated"));
-          }
-        } else if (candidate) {
-          try {
-            await pc.addIceCandidate(candidate);
-          } catch (e) {
-            if (!ignoreOffer) throw e;
-          }
-        } else if (run) {
-          send(window.parent, {[run.id]: await commands[run.cmd]() || 0});
-        }
-      } catch (e) {
-        fail(e);
-      }
-    };
-  } catch (e) {
-    fail(e);
-  }
-  return pc;
-}
-
-async function setupPeerIframe(t, polite) {
-  const iframe = document.createElement("iframe");
-  t.add_cleanup(() => iframe.remove());
-  iframe.srcdoc =
-   `<html\><script\>(${peer.toString()})(window.parent, ${polite});</script\></html\>`;
-  document.documentElement.appendChild(iframe);
-
-  const failCatcher = t.step_func(({data}) =>
-      ("error" in data) && assert_unreached(`Error in iframe: ${data.error}`));
-  window.addEventListener("message", failCatcher);
-  t.add_cleanup(() => window.removeEventListener("message", failCatcher));
-  await new Promise(r => iframe.onload = r);
-  return iframe;
-}
-
-function setupPeerTopLevel(t, other, polite) {
-  const pc = peer(other, polite, t.step_func(e => { throw e; }));
-  t.add_cleanup(() => { pc.close(); window.onmessage = null; });
-}
-
-let counter = 0;
-async function run(target, cmd) {
-  const id = `result${counter++}`;
-  target.postMessage({run: {cmd, id}}, "*");
-  return new Promise(r => window.addEventListener("message",
-                                                  function listen({data}) {
-    if (!(id in data)) return;
-    window.removeEventListener("message", listen);
-    r(data[id]);
-  }));
-}
-
-let iframe;
-async function setupAB(t, politeA, politeB) {
-  iframe = await setupPeerIframe(t, politeB);
-  return setupPeerTopLevel(t, iframe.contentWindow, politeA);
-}
-const runA = cmd => run(window, cmd);
-const runB = cmd => run(iframe.contentWindow, cmd);
-const runBoth = (cmdA, cmdB = cmdA) => Promise.all([runA(cmdA), runB(cmdB)]);
-
-async function promise_test_both_roles(f, name) {
-  promise_test(async t => f(t, await setupAB(t, true, false)), name);
-  promise_test(async t => f(t, await setupAB(t, false, true)),
-               `${name} with roles reversed`);
-}
-
 promise_test_both_roles(async (t, pc) => {
   assert_equals(await runA("simpleConnect"), 1, "one transceiver");
   assert_equals(await runB("addTransceiver"), 2, "two transceivers");
@@ -157,30 +19,4 @@ promise_test_both_roles(async (t, pc) => {
   assert_equals(numA, 2, "two transceivers on side A");
   assert_equals(numB, 2, "two transceivers on side B");
 }, "Perfect negotiation glare");
-
-promise_test_both_roles(async (t, pc) => {
-  const ps = [];
-  for (let i = 20; i > 0; i--) {
-    ps.push(runBoth("addTransceiver"));
-    await new Promise(r => t.step_timeout(r, i - 1));
-  }
-  ps.push(runBoth("addTransceiver"));
-  await Promise.all(ps);
-  const [numA, numB] = await runBoth("getNumTransceivers");
-  assert_equals(numA, 42, "42 transceivers on side A");
-  assert_equals(numB, 42, "42 transceivers on side B");
-}, "Perfect negotiation stress glare");
-
-promise_test_both_roles(async (t, pc) => {
-  const ps = [];
-  for (let i = 20; i > 0; i--) {
-    ps.push(runBoth("addTransceiver"));
-    await new Promise(r => t.step_timeout(r, 0));
-  }
-  ps.push(runBoth("addTransceiver"));
-  await Promise.all(ps);
-  const [numA, numB] = await runBoth("getNumTransceivers");
-  assert_equals(numA, 42, "42 transceivers on side A");
-  assert_equals(numB, 42, "42 transceivers on side B");
-}, "Perfect negotiation stress glare linear");
 </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html
index 71fffdc6860..6786bd49ede 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-videoDetectorTest.html
@@ -22,38 +22,38 @@
 // the test times out.
 
 async function signalSettlementTime(t, v, sender, signal, backgroundTrack) {
-  const detectionStream = await getNoiseStream({video: {signal: signal}});
+  const detectionStream = await getNoiseStream({video: {signal}});
   const [detectionTrack] = detectionStream.getTracks();
-  await sender.replaceTrack(detectionTrack);
-  const framesBefore = v.getVideoPlaybackQuality().totalVideoFrames;
-  await detectSignal(t, v, signal);
-  const framesAfter = v.getVideoPlaybackQuality().totalVideoFrames;
-  await sender.replaceTrack(backgroundTrack);
-  await detectSignal(t, v, 100);
-  detectionStream.getTracks().forEach(track => track.stop());
-  return (framesAfter - framesBefore);
+  try {
+    await sender.replaceTrack(detectionTrack);
+    const framesBefore = v.getVideoPlaybackQuality().totalVideoFrames;
+    await detectSignal(t, v, signal);
+    const framesAfter = v.getVideoPlaybackQuality().totalVideoFrames;
+    await sender.replaceTrack(backgroundTrack);
+    await detectSignal(t, v, 100);
+    return framesAfter - framesBefore;
+  } finally {
+    detectionTrack.stop();
+  }
 }
 
 promise_test(async t => {
   const v = document.createElement('video');
   v.autoplay = true;
   const pc1 = new RTCPeerConnection();
-  t.add_cleanup(() => pc1.close());
   const pc2 = new RTCPeerConnection();
+  t.add_cleanup(() => pc1.close());
   t.add_cleanup(() => pc2.close());
   const stream1 = await getNoiseStream({video: {signal: 100}});
-  t.add_cleanup(() => stream1.getTracks().forEach(track => track.stop()));
   const [track1] = stream1.getTracks();
+  t.add_cleanup(() => track1.stop());
+
   const sender = pc1.addTrack(track1);
-  pc2.ontrack = t.step_func((e) => {
-    v.srcObject = new MediaStream([e.track]);
-  });
-  const metadataToBeLoaded = new Promise((resolve) => {
-    v.addEventListener('loadedmetadata', resolve);
-  });
+  const haveTrackEvent = new Promise(r => pc2.ontrack = r);
   exchangeIceCandidates(pc1, pc2);
-  exchangeOfferAnswer(pc1, pc2);
-  await metadataToBeLoaded;
+  await exchangeOfferAnswer(pc1, pc2);
+  v.srcObject = new MediaStream([(await haveTrackEvent).track]);
+  await new Promise(r => v.onloadedmetadata = r);
   // The basic signal is a track with signal 100. We replace this
   // with tracks with signal from 0 to 255 and see if they are all
   // reliably detected.
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html
index f79c43b2919..bed359512a4 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver-setCodecPreferences.html
@@ -3,6 +3,7 @@
 <title>RTCRtpTransceiver.prototype.setCodecPreferences</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="./third_party/sdp/sdp.js"></script>
 <script>
   'use strict';
 
@@ -29,40 +30,41 @@
           an InvalidModificationError.
    */
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
     transceiver.setCodecPreferences(capabilities.codecs);
-
   }, `setCodecPreferences() on audio transceiver with codecs returned from RTCRtpSender.getCapabilities('audio') should succeed`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('video');
     const capabilities = RTCRtpReceiver.getCapabilities('video');
     transceiver.setCodecPreferences(capabilities.codecs);
-
   }, `setCodecPreferences() on video transceiver with codecs returned from RTCRtpReceiver.getCapabilities('video') should succeed`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities1 = RTCRtpSender.getCapabilities('audio');
     const capabilities2 = RTCRtpReceiver.getCapabilities('audio');
     transceiver.setCodecPreferences([...capabilities1.codecs, ... capabilities2.codecs]);
-
   }, `setCodecPreferences() with both sender receiver codecs combined should succeed`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     transceiver.setCodecPreferences([]);
-
   }, `setCodecPreferences([]) should succeed`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
     const { codecs } = capabilities;
@@ -74,11 +76,11 @@
     }
 
     transceiver.setCodecPreferences(codecs);
-
   }, `setCodecPreferences() with reordered codecs should succeed`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('video');
     const capabilities = RTCRtpSender.getCapabilities('video');
     const { codecs } = capabilities;
@@ -92,18 +94,68 @@
       }
     });
     assert_true(tried, 'VP8 video codec was found and tried');
-  }, `setCodecPreferences() with only one video codec should succeed`);
+  }, `setCodecPreferences() with only VP8 should succeed`);
 
   test(() => {
     const pc = new RTCPeerConnection();
+    const transceiver = pc.addTransceiver('video');
+    const capabilities = RTCRtpSender.getCapabilities('video');
+    const { codecs } = capabilities;
+    // This test verifies that the mandatory H264 codec is present
+    // and can be set.
+    let tried = false;
+    codecs.forEach(codec => {
+      if (codec.mimeType.toLowerCase() === 'video/h264') {
+        transceiver.setCodecPreferences([codecs[0]]);
+        tried = true;
+      }
+    });
+    assert_true(tried, 'H264 video codec was found and tried');
+  }, `setCodecPreferences() with only H264 should succeed`);
+
+  async function getRTPMapLinesWithCodecAsFirst(firstCodec)
+  {
+     const capabilities = RTCRtpSender.getCapabilities('video').codecs;
+     capabilities.forEach((codec, idx) => {
+       if (codec.mimeType === firstCodec) {
+          capabilities.splice(idx, 1);
+          capabilities.unshift(codec);
+       }
+     });
+
+     const pc = new RTCPeerConnection();
+     const transceiver = pc.addTransceiver('video');
+     transceiver.setCodecPreferences(capabilities);
+     const offer = await pc.createOffer();
+
+     return offer.sdp.split('\r\n').filter(line => line.indexOf("a=rtpmap") === 0);
+  }
+
+  promise_test(async () => {
+    const lines = await getRTPMapLinesWithCodecAsFirst('video/H264');
+
+    assert_greater_than(lines.length, 1);
+    assert_true(lines[0].indexOf("H264") !== -1, "H264 should be the first codec");
+  }, `setCodecPreferences() should allow setting H264 as first codec`);
+
+  promise_test(async () => {
+    const lines = await getRTPMapLinesWithCodecAsFirst('video/VP8');
+
+    assert_greater_than(lines.length, 1);
+    assert_true(lines[0].indexOf("VP8") !== -1, "VP8 should be the first codec");
+  }, `setCodecPreferences() should allow setting VP8 as first codec`);
+
+  test((t) => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('video');
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(capabilities.codecs));
-
   }, `setCodecPreferences() on audio transceiver with codecs returned from getCapabilities('video') should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const codecs = [{
       mimeType: 'data',
@@ -113,11 +165,11 @@
     }];
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with user defined codec with invalid mimeType should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const codecs = [{
       mimeType: 'audio/piepiper',
@@ -127,11 +179,11 @@
     }];
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with user defined codec should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
     const codecs = [
@@ -144,44 +196,44 @@
       }];
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with user defined codec together with codecs returned from getCapabilities() should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
     const codecs = [capabilities.codecs[0]];
     codecs[0].clockRate = codecs[0].clockRate / 2;
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with modified codec clock rate should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
     const codecs = [capabilities.codecs[0]];
     codecs[0].channels = codecs[0].channels + 11;
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with modified codec channel count should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
     const codecs = [capabilities.codecs[0]];
     codecs[0].sdpFmtpLine = "modifiedparameter=1";
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with modified codec parameters should throw InvalidModificationError`);
 
-  test(() => {
+  test((t) => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
     const transceiver = pc.addTransceiver('audio');
     const capabilities = RTCRtpSender.getCapabilities('audio');
 
@@ -194,7 +246,72 @@
     codec.channels = channels+1;
 
     assert_throws_dom('InvalidModificationError', () => transceiver.setCodecPreferences(codecs));
-
   }, `setCodecPreferences() with modified codecs returned from getCapabilities() should throw InvalidModificationError`);
 
+  promise_test(async (t) => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    const transceiver = pc.addTransceiver('audio');
+    const {codecs} = RTCRtpSender.getCapabilities('audio');
+    // Reorder codecs, put PCMU/PCMA first.
+    let firstCodec;
+    let i;
+    for (i = 0; i < codecs.length; i++) {
+      const codec = codecs[i];
+      if (codec.mimeType === 'audio/PCMU' || codec.mimeType === 'audio/PCMA') {
+        codecs.splice(i, 1);
+        codecs.unshift(codec);
+        firstCodec = codec.mimeType.substr(6);
+        break;
+      }
+    }
+    assert_not_equals(firstCodec, undefined, 'PCMU or PCMA codec not found');
+    transceiver.setCodecPreferences(codecs);
+
+    const offer = await pc.createOffer();
+    const mediaSection = SDPUtils.getMediaSections(offer.sdp)[0];
+    const rtpParameters = SDPUtils.parseRtpParameters(mediaSection);
+    assert_equals(rtpParameters.codecs[0].name, firstCodec);
+  }, `setCodecPreferences() modifies the order of audio codecs in createOffer`);
+
+  promise_test(async (t) => {
+    const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    const transceiver = pc.addTransceiver('video');
+    const {codecs} = RTCRtpSender.getCapabilities('video');
+    // Reorder codecs, swap H264 and VP8.
+    let vp8 = -1;
+    let h264 = -1;
+    let firstCodec;
+    let i;
+    for (i = 0; i < codecs.length; i++) {
+      const codec = codecs[i];
+      if (codec.mimeType === 'video/VP8') {
+        vp8 = i;
+        if (h264 !== -1) {
+          codecs[vp8] = codecs[h264];
+          codecs[h264] = codec;
+          firstCodec = 'VP8';
+          break;
+        }
+      }
+      if (codec.mimeType === 'video/H264') {
+        h264 = i;
+        if (vp8 !== -1) {
+          codecs[h264] = codecs[vp8];
+          codecs[vp8] = codec;
+          firstCodec = 'H264';
+          break;
+        }
+      }
+    }
+    assert_not_equals(firstCodec, undefined, 'VP8 and H264 codecs not found');
+    transceiver.setCodecPreferences(codecs);
+
+    const offer = await pc.createOffer();
+    const mediaSection = SDPUtils.getMediaSections(offer.sdp)[0];
+    const rtpParameters = SDPUtils.parseRtpParameters(mediaSection);
+    assert_equals(rtpParameters.codecs[0].name, firstCodec);
+  }, `setCodecPreferences() modifies the order of video codecs in createOffer`);
+
  </script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
index 48777498229..412736b1d19 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpTransceiver.https.html
@@ -425,6 +425,7 @@
 
     // Remove mid attr
     offer.sdp = offer.sdp.replace("a=mid:", "a=unknownattr:");
+    offer.sdp = offer.sdp.replace("a=group:", "a=unknownattr:");
     await pc2.setRemoteDescription(offer);
 
     hasPropsAndUniqueMids(pc2.getTransceivers(),
@@ -1536,9 +1537,11 @@
       ]);
 
     trickle(t, pc2, pc1);
+    // The negotiaionneeded event is fired during processing of
+    // setLocalDescription()
+    const negotiationNeededWaiter = negotiationNeeded(pc2);
     await pc2.setLocalDescription(answer);
-
-    await negotiationNeeded(pc2);
+    await negotiationNeededWaiter;
     await iceConnected(pc1);
     await iceConnected(pc2);
 
diff --git a/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_blocking_wsh.py b/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_blocking_wsh.py
new file mode 100755
index 00000000000..10ecdfe0da9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/websockets/handlers/stash_responder_blocking_wsh.py
@@ -0,0 +1,45 @@
+#!/usr/bin/python
+import json
+import threading
+import wptserve.stash
+from mod_pywebsocket import msgutil
+
+address, authkey = wptserve.stash.load_env_config()
+path = "/stash_responder_blocking"
+stash = wptserve.stash.Stash(path, address=address, authkey=authkey)
+cv = threading.Condition()
+
+def handle_set(key, value):
+    with cv:
+      stash.put(key, value)
+      cv.notify_all()
+
+def handle_get(key):
+    with cv:
+        while True:
+            value = stash.take(key)
+            if value is not None:
+                return value
+            cv.wait()
+
+def web_socket_do_extra_handshake(request):
+    pass
+
+def web_socket_transfer_data(request):
+    line = request.ws_stream.receive_message()
+
+    query = json.loads(line)
+    action = query["action"]
+    key = query["key"]
+
+    if action == "set":
+        value = query["value"]
+        handle_set(key, value)
+        response = {}
+    elif action == "get":
+        value = handle_get(key)
+        response = {"value": value}
+    else:
+        response = {}
+
+    msgutil.send_message(request, json.dumps(response))
diff --git a/tests/wpt/web-platform-tests/webstorage/README.md b/tests/wpt/web-platform-tests/webstorage/README.md
index 6b70aa5ac9d..2bbc5fbfb6a 100644
--- a/tests/wpt/web-platform-tests/webstorage/README.md
+++ b/tests/wpt/web-platform-tests/webstorage/README.md
@@ -1,2 +1,4 @@
 These are the storage (`localStorage`, `sessionStorage`) tests for the
 [Web storage chapter of the HTML Standard](https://html.spec.whatwg.org/multipage/webstorage.html).
+
+IDL is covered by `/html/dom/idlharness.https.html`.
diff --git a/tests/wpt/web-platform-tests/webstorage/idlharness.window.js b/tests/wpt/web-platform-tests/webstorage/idlharness.window.js
deleted file mode 100644
index 177eb607f7b..00000000000
--- a/tests/wpt/web-platform-tests/webstorage/idlharness.window.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-
-// http://www.w3.org/TR/webstorage/#storage
-
-idl_test(
-  [], [], // Srcs + deps manually handled below.
-  async idl_array => {
-    const [html, dom] = await Promise.all(['html', 'dom']
-        .map(i => fetch(`/interfaces/${i}.idl`).then(r => r.text())));
-    idl_array.add_idls(html, {
-      only: [
-        'Storage',
-        'WindowSessionStorage',
-        'WindowLocalStorage',
-        'StorageEvent',
-        'StorageEventInit',
-      ]});
-    idl_array.add_dependency_idls(dom);
-
-    idl_array.add_objects({
-      Storage: [
-        'localStorage',
-        'sessionStorage',
-      ],
-      StorageEvent: ['new StorageEvent("storage")']
-    });
-  }
-);
diff --git a/tests/wpt/web-platform-tests/webstorage/set.window.js b/tests/wpt/web-platform-tests/webstorage/set.window.js
index 228ce602966..1c20907939a 100644
--- a/tests/wpt/web-platform-tests/webstorage/set.window.js
+++ b/tests/wpt/web-platform-tests/webstorage/set.window.js
@@ -43,7 +43,7 @@
             assert_equals(storage[key], proto);
             assert_equals(storage.getItem(key), null);
             assert_equals(storage[key] = value, value);
-            // Hidden because no [OverrideBuiltins].
+            // Hidden because no [LegacyOverrideBuiltins].
             assert_equals(storage[key], proto);
             assert_equals(Object.getOwnPropertyDescriptor(storage, key), undefined);
             assert_equals(storage.getItem(key), value);
@@ -62,7 +62,7 @@
 
             storage.setItem(key, existing);
 
-            // Hidden because no [OverrideBuiltins].
+            // Hidden because no [LegacyOverrideBuiltins].
             assert_equals(storage[key], proto);
             assert_equals(Object.getOwnPropertyDescriptor(storage, key), undefined);
             assert_equals(storage.getItem(key), existing);
@@ -93,7 +93,7 @@
             assert_equals(storage[key], proto);
             assert_equals(storage.getItem(key), null);
             assert_equals(storage[key] = value, value);
-            // Property is hidden because no [OverrideBuiltins].
+            // Property is hidden because no [LegacyOverrideBuiltins].
             assert_equals(storage[key], proto);
             assert_equals(Object.getOwnPropertyDescriptor(storage, key), undefined);
             assert_equals(storage.getItem(key), value);
diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js b/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
index b41c054c716..bb674512478 100644
--- a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
+++ b/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
@@ -33,15 +33,15 @@ async function loadChromiumResources() {
 
 function usb_test(func, name, properties) {
   promise_test(async () => {
+    assert_implements(navigator.usb, 'missing navigator.usb');
     if (navigator.usb.test === undefined) {
       // Try loading a polyfill for the WebUSB Testing API.
       if (isChromiumBased) {
         await loadChromiumResources();
         await loadScript('/resources/chromium/webusb-test.js');
-      } else {
-        assert_implements(false, "missing navigator.usb.test");
       }
     }
+    assert_implements(navigator.usb.test, 'missing navigator.usb.test after initialization');
 
     await navigator.usb.test.initialize();
     try {
diff --git a/tests/wpt/web-platform-tests/webxr/hand-input/idlharness.https.window.js b/tests/wpt/web-platform-tests/webxr/hand-input/idlharness.https.window.js
new file mode 100644
index 00000000000..184ec6b3060
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webxr/hand-input/idlharness.https.window.js
@@ -0,0 +1,16 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://immersive-web.github.io/webxr-hand-input/
+
+idl_test(
+  ['webxr-hand-input'],
+  ['webxr', 'dom'],
+  async idl_array => {
+    idl_array.add_objects({
+      // TODO
+    });
+  }
+);
diff --git a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js b/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
index a987ca1f442..aa45e257db6 100644
--- a/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
+++ b/tests/wpt/web-platform-tests/webxr/resources/webxr_util.js
@@ -18,6 +18,8 @@ function xr_promise_test(name, func, properties) {
     // Perform any required test setup:
     xr_debug(name, 'setup');
 
+    assert_implements(navigator.xr, 'missing navigator.xr');
+
     // Only set up once.
     if (!navigator.xr.test) {
       // Load test-only API helpers.
@@ -37,8 +39,6 @@ function xr_promise_test(name, func, properties) {
       } else if (isWebKitBased) {
         // WebKit setup
         await setupWebKitWebXRTestAPI();
-      } else {
-        assert_implements(false, "missing navigator.xr.test");
       }
     }
 
@@ -47,11 +47,7 @@ function xr_promise_test(name, func, properties) {
     // setup properly. Either way, the fact that xr_promise_test is being used
     // means that the tests expect navigator.xr.test to be set. By rejecting now
     // we can hopefully provide a clearer indication of what went wrong.
-    if (!navigator.xr.test) {
-      // We can't use assert_true here because it causes the wpt testharness
-      // to treat this as a test page and not as a test.
-      return Promise.reject("No navigator.xr.test object found, even after attempted load");
-    }
+    assert_implements(navigator.xr.test, 'missing navigator.xr.test, even after attempted load');
 
     // Ensure that any devices are disconnected when done. If this were done in
     // a .then() for the success case, a test that expected failure would
@@ -200,7 +196,7 @@ function forEachWebxrObject(callback) {
 
 // Code for loading test API in Chromium.
 async function loadChromiumResources() {
-  let chromiumResources = [
+  const chromiumResources = [
     '/gen/mojo/public/mojom/base/time.mojom.js',
     '/gen/mojo/public/mojom/base/shared_memory.mojom.js',
     '/gen/mojo/public/mojom/base/unguessable_token.mojom.js',
@@ -217,22 +213,26 @@ async function loadChromiumResources() {
     '/gen/ui/display/mojom/display.mojom.js',
     '/gen/device/gamepad/public/mojom/gamepad.mojom.js',
     '/gen/device/vr/public/mojom/vr_service.mojom.js',
+  ];
+
+  let extraResources = [
     '/resources/chromium/webxr-test-math-helper.js',
     '/resources/chromium/webxr-test.js',
-    // Required only by resources/chromium/webxr-test.js
     '/resources/testdriver.js',
     '/resources/testdriver-vendor.js',
   ];
-
   // This infrastructure is also used by Chromium-specific internal tests that
   // may need additional resources (e.g. internal API extensions), this allows
   // those tests to rely on this infrastructure while ensuring that no tests
   // make it into public WPTs that rely on APIs outside of the webxr test API.
   if (typeof(additionalChromiumResources) !== 'undefined') {
-    chromiumResources = chromiumResources.concat(additionalChromiumResources);
+    extraResources = extraResources.concat(additionalChromiumResources);
   }
 
   await loadMojoResources(chromiumResources);
+  for (const path of extraResources) {
+    await loadScript(path);
+  }
 
   xr_debug = navigator.xr.test.Debug;
 }
diff --git a/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm b/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm
index 55d81d5d1c9..29cc5d3345f 100644
--- a/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm
+++ b/tests/wpt/web-platform-tests/workers/Worker_script_mimetype.htm
@@ -1,16 +1,35 @@
 <!DOCTYPE html>
-<title> Worker constructor with script inside text file </title>
+<title>Worker constructor with wrong MIME type scripts</title>
+<meta charset="utf-8">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<div id=log></div>
+
 <script>
-async_test(function(t) {
-  var worker = new Worker('./support/WorkerText.txt');
-  worker.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data, "Pass");
-  });
-  // TODO(mkwst): Revisit this after https://github.com/whatwg/html/issues/3255.
-  worker.onerror = t.unreached_func("Worker should load.");
-  worker.postMessage("start");
-});
+async_test(t => {
+  const worker = new Worker('./support/WorkerText.txt');
+  worker.onmessage = t.unreached_func("Worker should not recieve messages");
+  worker.onerror = () => t.done();
+}, "HTTP(S) URLs which respond with text/plain MIME type must not work");
+
+async_test(t => {
+  const url = URL.createObjectURL(new Blob(['postMessage("PASS")'])); // no MIME type parameter
+  const worker = new Worker(url);
+  worker.onmessage = () => t.done();
+  worker.onerror = t.unreached_func("Worker should not error");
+}, "blob: URLs should load, despite no MIME type for the backing Blob");
+
+async_test(t => {
+  const url = URL.createObjectURL(new Blob(['postMessage("PASS")'], { type: 'text/plain' }));
+  const worker = new Worker(url);
+  worker.onmessage = () => t.done();
+  worker.onerror = t.unreached_func("Worker should not error");
+}, "blob: URLs should load, despite the wrong MIME type for the backing Blob");
+
+async_test(t => {
+  const url = `data:text/plain,postMessage("PASS");`
+  const worker = new Worker(url);
+  worker.onmessage = () => t.done();
+  worker.onerror = t.unreached_func("Worker should not error");
+}, "data: URLs should load, despite the wrong MIME type");
+
 </script>
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html
index d8aa02a01b8..5f3999db66a 100644
--- a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.html
@@ -59,28 +59,28 @@ for (const type of ['classic', 'module']) {
   const workerOptions = type === 'module' ? {type: 'module'}: {};
 
   const worker1 = new Worker(
-      'exception-in-onerror.js?throw-in-worker-initialization',
+      'throw.js?throw-in-toplevel&throw-in-onerror',
       workerOptions);
   expectErrors(
       worker1,
       'Throw in worker initialization: ' + type,
-      ['Throw in worker initialization', 'Throw in error handler']);
+      ['Throw in toplevel', 'Throw in error handler']);
 
   const worker2 = new Worker(
-      'exception-in-onerror.js?throw-in-setTimeout-function', workerOptions);
+      'throw.js?throw-in-setTimeout-function&throw-in-onerror', workerOptions);
   expectErrors(
       worker2,
       'Throw in setTimeout(function): ' + type,
       ['Throw in setTimeout function', 'Throw in error handler']);
 
   const worker3 = new Worker(
-      'exception-in-onerror.js?throw-in-setTimeout-string', workerOptions);
+      'throw.js?throw-in-setTimeout-string&throw-in-onerror', workerOptions);
   expectErrors(
       worker3,
       'Throw in setTimeout(string): ' + type,
       ['Throw in setTimeout string', 'Throw in error handler']);
 
-  const worker4 = new Worker('exception-in-onerror.js', workerOptions);
+  const worker4 = new Worker('throw.js?throw-in-onerror', workerOptions);
   worker4.postMessage('foo');
   expectErrors(
       worker4,
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.js
deleted file mode 100644
index 61a95dda51f..00000000000
--- a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/exception-in-onerror.js
+++ /dev/null
@@ -1,25 +0,0 @@
-onerror = function() {
-  throw new Error('Throw in error handler');
-  return false;
-};
-onmessage = function() {
-  throw new Error('Throw in message handler');
-  return false;
-};
-
-if (self.location.href.indexOf(
-        'throw-in-worker-initialization') >= 0) {
-  throw new Error('Throw in worker initialization');
-}
-
-if (self.location.href.indexOf(
-        'throw-in-setTimeout-function') >= 0) {
-  // To test the behavior of setTimeout(), raw setTimeout() is used.
-  setTimeout(() => { throw new Error('Throw in setTimeout function') }, 0);
-}
-
-if (self.location.href.indexOf(
-        'throw-in-setTimeout-string') >= 0) {
-  // To test the behavior of setTimeout(), raw setTimeout() is used.
-  setTimeout("throw new Error('Throw in setTimeout string')", 0);
-}
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html
new file mode 100644
index 00000000000..df8c8514750
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-DOMException.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./message-helper.js"></script>
+<script>
+runTest('classic', 'DOMException-TypeError');
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html
new file mode 100644
index 00000000000..e026b6ebf09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-classic-Error.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./message-helper.js"></script>
+<script>
+runTest('classic', 'Error');
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js
new file mode 100644
index 00000000000..6271329b031
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-helper.js
@@ -0,0 +1,61 @@
+// The error's `message` values in Worker error event handlers are tested.
+// While not explicitly specified in the HTML spec, we expect some information
+// about thrown errors (e.g. original message, the string "TypeError", etc.)
+// to appear in the `message`.
+
+function prepareHandler(t, error, expectedCount) {
+  let count = 0;
+  return t.step_func(e => {
+      e.preventDefault();
+
+      assert_regexp_match(
+          e.message,
+          /Throw in/,
+          'e.message should contain the message of the thrown error');
+
+      if (error === 'DOMException-TypeError') {
+        assert_regexp_match(e.message, /TypeError/);
+      }
+
+      ++count;
+      if (count >= expectedCount) {
+        t.done();
+      }
+    });
+}
+
+function expectErrors(worker, error, expectedCount, title) {
+  async_test(t => {
+      worker.addEventListener('error',
+                              prepareHandler(t, error, expectedCount));
+    }, title+ ': listener');
+  async_test(t => {
+      worker.onerror = prepareHandler(t, error, expectedCount);
+    }, title + ': handler');
+}
+
+function runTest(type, error) {
+  for (const location of ['toplevel',
+                          'setTimeout-function',
+                          'setTimeout-string',
+                          'onmessage',
+                          'onerror']) {
+    const worker = new Worker(
+        'throw.js?throw-in-' + location + '&error=' + error,
+        {type});
+    let expectedCount = 1;
+    if (location === 'onmessage') {
+      // This makes the worker's message handler to throw an error.
+      worker.postMessage('foo');
+    }
+    if (location === 'onerror') {
+      // This makes the worker's message handler to throw an error,
+      // AND worker's error handler to throw another error.
+      // Therefore we expect two errors here.
+      worker.postMessage('foo');
+      expectedCount = 2;
+    }
+    expectErrors(worker, error, expectedCount,
+        'Throw ' + error + ' in ' + location + ': ' + type);
+  }
+}
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html
new file mode 100644
index 00000000000..8ed873bc322
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-DOMException.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./message-helper.js"></script>
+<script>
+runTest('module', 'DOMException-TypeError');
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html
new file mode 100644
index 00000000000..046ff969d6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/message-module-Error.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./message-helper.js"></script>
+<script>
+runTest('module', 'Error');
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js
new file mode 100644
index 00000000000..704098a6d86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/interfaces/WorkerGlobalScope/onerror/throw.js
@@ -0,0 +1,34 @@
+const params = new URL(self.location.href).searchParams;
+
+self.createError = (message) => {
+  if (params.get('error') === 'DOMException-TypeError') {
+    return new DOMException(message, 'TypeError');
+  } else {
+    return new Error(message);
+  }
+};
+
+onerror = function() {
+  if (params.has('throw-in-onerror')) {
+    throw createError('Throw in error handler');
+  }
+  return false;
+};
+onmessage = function() {
+  throw createError('Throw in message handler');
+  return false;
+};
+
+if (params.has('throw-in-toplevel')) {
+  throw createError('Throw in toplevel');
+}
+
+// We don't use step_timeout() here, because we have to test the behavior of
+// setTimeout() without wrappers.
+if (params.has('throw-in-setTimeout-function')) {
+  setTimeout(() => { throw createError('Throw in setTimeout function') }, 0);
+}
+
+if (params.has('throw-in-setTimeout-string')) {
+  setTimeout("throw createError('Throw in setTimeout string')", 0);
+}
diff --git a/tests/wpt/web-platform-tests/x-frame-options/META.yml b/tests/wpt/web-platform-tests/x-frame-options/META.yml
index 674a1648847..21ef0699364 100644
--- a/tests/wpt/web-platform-tests/x-frame-options/META.yml
+++ b/tests/wpt/web-platform-tests/x-frame-options/META.yml
@@ -1,4 +1,5 @@
-spec: https://tools.ietf.org/html/rfc7034
+spec: https://html.spec.whatwg.org/#the-x-frame-options-header
 suggested_reviewers:
   - annevk
   - mikewest
+  - domenic
diff --git a/tests/wpt/web-platform-tests/x-frame-options/README.md b/tests/wpt/web-platform-tests/x-frame-options/README.md
index 7b35f0f1d14..2fad3599d5c 100644
--- a/tests/wpt/web-platform-tests/x-frame-options/README.md
+++ b/tests/wpt/web-platform-tests/x-frame-options/README.md
@@ -1,2 +1,3 @@
-This directory contains tests for
-[HTTP Header Field X-Frame-Options](https://tools.ietf.org/html/rfc7034).
+This directory contains tests for [`X-Frame-Options`](https://html.spec.whatwg.org/#the-x-frame-options-header).
+
+Currently it only tests `<iframe>`. It would be nice to test `<embed>` and `<object>` as well.
diff --git a/tests/wpt/web-platform-tests/x-frame-options/deny.html b/tests/wpt/web-platform-tests/x-frame-options/deny.html
new file mode 100644
index 00000000000..90f65d3f439
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/deny.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>X-Frame-Options variations of DENY</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/helper.sub.js"></script>
+
+<body>
+<script>
+"use strict";
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `denY`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `  DENY `,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  cspValue: `default-src 'self'`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  cspValue: `frame-ancestors 'self'`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: false
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/deny.sub.html b/tests/wpt/web-platform-tests/x-frame-options/deny.sub.html
deleted file mode 100644
index dd8afe8079a..00000000000
--- a/tests/wpt/web-platform-tests/x-frame-options/deny.sub.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
-<body>
-<script>
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=DENY";
-
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: DENY` blocks same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/xfo.py?value=DENY";
-
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: DENY` blocks cross-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=DENY&csp_value=default-src%20'self'";
-
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: DENY` blocks framing when CSP is present without a frame-ancestors directive.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=DENY&csp_value=frame-ancestors%20'self'";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: DENY` does not blocks framing when CSP is present with a frame-ancestors directive.");
-</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/get-decode-split.html b/tests/wpt/web-platform-tests/x-frame-options/get-decode-split.html
new file mode 100644
index 00000000000..9f5101d610e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/get-decode-split.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>X-Frame-Options headers use the get, decode, and split algorithm</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+
+<body>
+<script>
+"use strict";
+
+xfo_simple_tests({
+  headerValue: `,SAMEORIGIN,,DENY,`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `  SAMEORIGIN,    DENY`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/invalid.html b/tests/wpt/web-platform-tests/x-frame-options/invalid.html
new file mode 100644
index 00000000000..26b2905e4d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/invalid.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>X-Frame-Options invalid values</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./support/helper.sub.js"></script>
+
+<body>
+<script>
+"use strict";
+
+xfo_simple_tests({
+  headerValue: `INVALID`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `ALLOW-FROM https://example.com/`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `ALLOW-FROM=https://example.com/`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `ALLOWALL`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `"DENY"`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `"SAMEORIGIN"`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `"SAMEORIGIN,DENY"`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: ``,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/invalid.sub.html b/tests/wpt/web-platform-tests/x-frame-options/invalid.sub.html
deleted file mode 100644
index 4604033d01f..00000000000
--- a/tests/wpt/web-platform-tests/x-frame-options/invalid.sub.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
-<body>
-<script>
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=INVALID";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: INVALID` allows same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/xfo.py?value=INVALID";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: INVALID` allows cross-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=ALLOWALL";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: ALLOWALL` allows same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/xfo.py?value=ALLOWALL";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: ALLOWALL` allows cross-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "Empty `XFO:` allows same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/xfo.py?value=";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "Empty `XFO:` allows cross-origin framing.");
-</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/multiple.html b/tests/wpt/web-platform-tests/x-frame-options/multiple.html
new file mode 100644
index 00000000000..cc8d6e3fdaa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/multiple.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>X-Frame-Options headers sent multiple times</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+
+<body>
+<script>
+"use strict";
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: `SAMEORIGIN`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: `sameOrigin`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: `DENY`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: `INVALID`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: `ALLOWALL`, // same as INVALID
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: `"DENY"`, // same as INVALID
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  headerValue2: ``, // same as INVALID
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  headerValue2: `DENY`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  headerValue2: `INVALID`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  headerValue2: `ALLOWALL`, // same as INVALID
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `DENY`,
+  headerValue2: `"SAMEORIGIN"`, // same as INVALID
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `ALLOWALL`,
+  headerValue2: `INVALID`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `ALLOWALL`,
+  headerValue2: ``,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `allowAll`,
+  headerValue2: `INVALID`,
+  sameOriginAllowed: false,
+  crossOriginAllowed: false
+});
+
+xfo_simple_tests({
+  headerValue: `INVALID`,
+  headerValue2: `INVALID`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+xfo_simple_tests({
+  headerValue: `INVALID`,
+  headerValue2: ``,
+  sameOriginAllowed: true,
+  crossOriginAllowed: true
+});
+
+</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/multiple.sub.html b/tests/wpt/web-platform-tests/x-frame-options/multiple.sub.html
deleted file mode 100644
index 717e9fd25c5..00000000000
--- a/tests/wpt/web-platform-tests/x-frame-options/multiple.sub.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
-<body>
-<script>
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=SAMEORIGIN&value2=SAMEORIGIN";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN; XFO: SAMEORIGIN` allows same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=SAMEORIGIN&value2=DENY";
-
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN; XFO: DENY` blocks same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=DENY&value2=SAMEORIGIN";
-
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: DENY; XFO: SAMEORIGIN` blocks same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=INVALID&value2=SAMEORIGIN";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: INVALID; XFO: SAMEORIGIN` allows same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=SAMEORIGIN&value2=INVALID";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN; XFO: INVALID` allows same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/xfo.py?value=SAMEORIGIN&value2=SAMEORIGIN";
-
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN; XFO: SAMEORIGIN` blocks cross-origin framing.");
-</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/redirect.html b/tests/wpt/web-platform-tests/x-frame-options/redirect.html
new file mode 100644
index 00000000000..65fd0d5dd14
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/redirect.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>X-Frame-Options headers sent along with a redirect</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+
+<body>
+<script>
+"use strict";
+
+xfo_test({
+  url: `./support/redirect.py?value=DENY&url=/x-frame-options/support/xfo.py%3Fvalue%3DALLOWALL`,
+  check: "loaded message",
+  message: `XFO on redirect responses is ignored`
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/redirect.sub.html b/tests/wpt/web-platform-tests/x-frame-options/redirect.sub.html
deleted file mode 100644
index 0bc708b358c..00000000000
--- a/tests/wpt/web-platform-tests/x-frame-options/redirect.sub.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
-<body>
-<script>
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/redirect.py?value=DENY&url=/x-frame-options/support/xfo.py%3Fvalue%3DALLOWALL";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "XFO on redirect responses is ignored.");
-</script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html b/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html
index ede54468259..45f9b01bf15 100644
--- a/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html
+++ b/tests/wpt/web-platform-tests/x-frame-options/sameorigin.sub.html
@@ -1,86 +1,53 @@
 <!DOCTYPE html>
+<meta charset="utf-8">
+<title>X-Frame-Options variations of SAMEORIGIN</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="./support/helper.js"></script>
+<script src="./support/helper.sub.js"></script>
+
 <body>
 <script>
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/xfo.py?value=SAMEORIGIN";
+"use strict";
 
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
+xfo_simple_tests({
+  headerValue: `SAMEORIGIN`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: false
+});
 
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN` allows same-origin framing.");
+xfo_simple_tests({
+  headerValue: `sameOriGin`,
+  sameOriginAllowed: true,
+  crossOriginAllowed: false
+});
 
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src =
-      "./support/nested.py?origin=http://{{host}}:{{ports[http][0]}}&value=SAMEORIGIN&loadShouldSucceed=true";
+xfo_simple_tests({
+  headerValue: `  SAMEORIGIN `,
+  sameOriginAllowed: true,
+  crossOriginAllowed: false
+});
 
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Loaded");
-        i.remove();
-      }));
+xfo_test({
+  url: `./support/nested.py?origin=http://{{host}}:{{ports[http][0]}}&value=SAMEORIGIN&loadShouldSucceed=true`,
+  check: "loaded message",
+  message: `SAMEORIGIN allows same-origin nested in same-origin framing`
+});
 
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN` allows same-origin nested in same-origin framing.");
+xfo_test({
+  url: `./support/nested.py?origin=http://{{domains[www]}}:{{ports[http][0]}}&value=SAMEORIGIN`,
+  check: "failed message",
+  message: `SAMEORIGIN blocks cross-origin nested in same-origin framing`
+});
 
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/xfo.py?value=SAMEORIGIN";
+xfo_test({
+  url: `http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/nested.py?origin=http://{{host}}:{{ports[http][0]}}&value=SAMEORIGIN`,
+  check: "failed message",
+  message: `SAMEORIGIN blocks same-origin nested in cross-origin framing`
+});
 
-    assert_no_message_from(i, t);
-
-    i.onload = t.step_func_done(_ => {
-      assert_equals(i.contentDocument, null);
-      i.remove();
-    });
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN` blocks cross-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "./support/nested.py?origin=http://{{domains[www]}}:{{ports[http][0]}}&value=SAMEORIGIN";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Failed");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN` blocks cross-origin nested in same-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/nested.py?origin=http://{{host}}:{{ports[http][0]}}&value=SAMEORIGIN";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Failed");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN` blocks same-origin nested in cross-origin framing.");
-
-  async_test(t => {
-    var i = document.createElement('iframe');
-    i.src = "http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/nested.py?origin=http://{{domains[www]}}:{{ports[http][0]}}&value=SAMEORIGIN";
-
-    wait_for_message_from(i, t)
-      .then(t.step_func_done(e => {
-        assert_equals(e.data, "Failed");
-        i.remove();
-      }));
-
-    document.body.appendChild(i);
-  }, "`XFO: SAMEORIGIN` blocks cross-origin nested in cross-origin framing.");
+xfo_test({
+  url: `http://{{domains[www]}}:{{ports[http][0]}}/x-frame-options/support/nested.py?origin=http://{{domains[www]}}:{{ports[http][0]}}&value=SAMEORIGIN`,
+  check: "failed message",
+  message: `SAMEORIGIN blocks cross-origin nested in cross-origin framing`
+});
 </script>
diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/helper.js b/tests/wpt/web-platform-tests/x-frame-options/support/helper.js
deleted file mode 100644
index 2932a0a7fb0..00000000000
--- a/tests/wpt/web-platform-tests/x-frame-options/support/helper.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function assert_no_message_from(frame, test) {
-  wait_for_message_from(frame, test)
-    .then(test.unreached_func("Frame should not have sent a message."));
-}
-
-function wait_for_message_from(frame, test) {
-  return new Promise((resolve, reject) => {
-    window.addEventListener("message", test.step_func(e => {
-      if (e.source == frame.contentWindow)
-        resolve(e);
-    }));
-  });
-}
diff --git a/tests/wpt/web-platform-tests/x-frame-options/support/helper.sub.js b/tests/wpt/web-platform-tests/x-frame-options/support/helper.sub.js
new file mode 100644
index 00000000000..23663dd2d07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/support/helper.sub.js
@@ -0,0 +1,104 @@
+function xfo_simple_tests({ headerValue, headerValue2, cspValue, sameOriginAllowed, crossOriginAllowed }) {
+  simpleXFOTestsInner({
+    urlPrefix: "",
+    allowed: sameOriginAllowed,
+    headerValue,
+    headerValue2,
+    cspValue,
+    sameOrCross: "same-origin"
+  });
+
+  simpleXFOTestsInner({
+    urlPrefix: "http://{{domains[www]}}:{{ports[http][0]}}",
+    allowed: crossOriginAllowed,
+    headerValue,
+    headerValue2,
+    cspValue,
+    sameOrCross: "cross-origin"
+  });
+}
+
+function simpleXFOTestsInner({ urlPrefix, allowed, headerValue, headerValue2, cspValue, sameOrCross }) {
+  const value2QueryString = headerValue2 !== undefined ? `&value2=${headerValue2}` : ``;
+  const cspQueryString = cspValue !== undefined ? `&csp_value=${cspValue}` : ``;
+
+  const valueMessageString = headerValue === "" ? "(the empty string)" : headerValue;
+  const value2MessageString = headerValue2 === "" ? "(the empty string)" : headerValue2;
+  const value2MaybeMessageString = headerValue2 !== undefined ? `;${headerValue2}` : ``;
+  const cspMessageString = cspValue !== undefined ? ` with CSP ${cspValue}` : ``;
+
+  // This will test the multi-header variant, if headerValue2 is not undefined.
+  xfo_test({
+    url: `${urlPrefix}/x-frame-options/support/xfo.py?value=${headerValue}${value2QueryString}${cspQueryString}`,
+    check: allowed ? "loaded message" : "no message",
+    message: `\`${valueMessageString}${value2MaybeMessageString}\` ${allowed ? "allows" : "blocks"} ${sameOrCross} framing${cspMessageString}`
+  });
+
+  if (headerValue2 !== undefined && headerValue2 !== headerValue) {
+    // Reversed variant
+    xfo_test({
+      url: `${urlPrefix}/x-frame-options/support/xfo.py?value=${headerValue2}&value2=${headerValue}${cspQueryString}`,
+      check: allowed ? "loaded message" : "no message",
+      message: `\`${value2MessageString};${valueMessageString}\` ${allowed ? "allows" : "blocks"} ${sameOrCross} framing${cspMessageString}`
+    });
+
+    // Comma variant
+    xfo_test({
+      url: `${urlPrefix}/x-frame-options/support/xfo.py?value=${headerValue},${headerValue2}${cspQueryString}`,
+      check: allowed ? "loaded message" : "no message",
+      message: `\`${valueMessageString},${value2MessageString}\` ${allowed ? "allows" : "blocks"} ${sameOrCross} framing${cspMessageString}`
+    });
+
+    // Comma + reversed variant
+    xfo_test({
+      url: `${urlPrefix}/x-frame-options/support/xfo.py?value=${headerValue2},${headerValue}${cspQueryString}`,
+      check: allowed ? "loaded message" : "no message",
+      message: `\`${value2MessageString},${valueMessageString}\` ${allowed ? "allows" : "blocks"} ${sameOrCross} framing${cspMessageString}`
+    });
+  }
+}
+
+function xfo_test({ url, check, message }) {
+  async_test(t => {
+    const i = document.createElement("iframe");
+    i.src = url;
+
+    switch (check) {
+      case "loaded message": {
+        waitForMessageFrom(i, t).then(t.step_func_done(e => {
+          assert_equals(e.data, "Loaded");
+        }));
+        break;
+      }
+      case "failed message": {
+        waitForMessageFrom(i, t).then(t.step_func_done(e => {
+          assert_equals(e.data, "Failed");
+        }));
+        break;
+      }
+      case "no message": {
+        waitForMessageFrom(i, t).then(t.unreached_func("Frame should not have sent a message."));
+        i.onload = t.step_func_done(() => {
+          assert_equals(i.contentDocument, null);
+        });
+        break;
+      }
+      default: {
+        throw new Error("Bad test");
+      }
+    }
+
+    document.body.append(i);
+    t.add_cleanup(() => i.remove());
+  }, message);
+}
+
+function waitForMessageFrom(frame, test) {
+  return new Promise(resolve => {
+    window.addEventListener("message", test.step_func(e => {
+      if (e.source == frame.contentWindow) {
+        resolve(e);
+      }
+    }));
+  });
+}

From 8f330288a6b8c73bf40c6720646e63280f3f2b00 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 12 Sep 2020 12:28:12 -0400
Subject: [PATCH 2/9] Add mac-only failure.

---
 .../css-backgrounds/border-width-small-values-001-a.html.ini  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini
index 17392520cdd..1f608e738ad 100644
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-a.html.ini
@@ -1,2 +1,4 @@
 [border-width-small-values-001-a.html]
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL
+    

From 6a9fcba8af6c32e01516c123bf3a56b9ffea7786 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 12 Sep 2020 12:28:43 -0400
Subject: [PATCH 3/9] Add linux-only failure.

---
 .../css-backgrounds/border-width-small-values-001-b.html.ini   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini
index 4fb4cdce41d..7e86bfef0a6 100644
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-width-small-values-001-b.html.ini
@@ -1,2 +1,3 @@
 [border-width-small-values-001-b.html]
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL

From cff61260c20919d21efe9146921b5158f4b7ef39 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 12 Sep 2020 12:30:09 -0400
Subject: [PATCH 4/9] Add 2020 failure.

---
 .../css/css-backgrounds/border-radius-012.html.ini              | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-012.html.ini

diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-012.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-012.html.ini
new file mode 100644
index 00000000000..a75c61765b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-backgrounds/border-radius-012.html.ini
@@ -0,0 +1,2 @@
+[border-radius-012.html]
+  expected: FAIL

From 82a335719bd39787d9faed22a5e26994df3a6f6e Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 12 Sep 2020 12:30:36 -0400
Subject: [PATCH 5/9] Add 2020 failure.

---
 .../css/css-masking/clip-no-stacking-context.html.ini           | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-masking/clip-no-stacking-context.html.ini

diff --git a/tests/wpt/metadata-layout-2020/css/css-masking/clip-no-stacking-context.html.ini b/tests/wpt/metadata-layout-2020/css/css-masking/clip-no-stacking-context.html.ini
new file mode 100644
index 00000000000..d9d6ef6d208
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-masking/clip-no-stacking-context.html.ini
@@ -0,0 +1,2 @@
+[clip-no-stacking-context.html]
+  expected: FAIL

From b9b50cb4940b5815786a3f158193f86006ab5b07 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Sat, 12 Sep 2020 12:35:05 -0400
Subject: [PATCH 6/9] Add CSS animation test failure.

---
 .../css/css-animations/event-dispatch.tentative.html.ini       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/wpt/metadata-layout-2020/css/css-animations/event-dispatch.tentative.html.ini b/tests/wpt/metadata-layout-2020/css/css-animations/event-dispatch.tentative.html.ini
index 71a270add94..a06b8682a5e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-animations/event-dispatch.tentative.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-animations/event-dispatch.tentative.html.ini
@@ -79,4 +79,7 @@
 
   [Redundant change, before -> after, then back]
     expected: FAIL
+  
+  [After -> Idle, display: none]
+    expected: FAIL
 

From 8bb4c28d64b2598e9bbb7e48c54949cb51bf0d72 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 15 Sep 2020 11:47:23 -0400
Subject: [PATCH 7/9] Move new test metadata.

---
 .../css/css-masking/{ => clip}/clip-no-stacking-context.html.ini  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename tests/wpt/metadata-layout-2020/css/css-masking/{ => clip}/clip-no-stacking-context.html.ini (100%)

diff --git a/tests/wpt/metadata-layout-2020/css/css-masking/clip-no-stacking-context.html.ini b/tests/wpt/metadata-layout-2020/css/css-masking/clip/clip-no-stacking-context.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/css/css-masking/clip-no-stacking-context.html.ini
rename to tests/wpt/metadata-layout-2020/css/css-masking/clip/clip-no-stacking-context.html.ini

From 35ff007d2810de3dcffd5bf0a6f3174b5765e63f Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 15 Sep 2020 11:48:53 -0400
Subject: [PATCH 8/9] Add linux-only failure.

Co-authored-by: cybai <cyb.ai.815@gmail.com>
---
 .../css-backgrounds/border-width-small-values-001-b.html.ini   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini
index 4fb4cdce41d..7e86bfef0a6 100644
--- a/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-b.html.ini
@@ -1,2 +1,3 @@
 [border-width-small-values-001-b.html]
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL

From 673865bbb686cf7b72eba5c7be614f0e18564941 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 15 Sep 2020 11:49:02 -0400
Subject: [PATCH 9/9] Add linux-only failure.

Co-authored-by: cybai <cyb.ai.815@gmail.com>
---
 .../css-backgrounds/border-width-small-values-001-a.html.ini   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini
index 17392520cdd..3ac4f9f4b65 100644
--- a/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/border-width-small-values-001-a.html.ini
@@ -1,2 +1,3 @@
 [border-width-small-values-001-a.html]
-  expected: FAIL
+  expected:
+    if os == "linux": FAIL