From 0431e20517104751c482d2d5272ef68091d55044 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Wed, 8 Mar 2023 02:06:05 +0000
Subject: [PATCH] Update web-platform-tests to revision
 b'14684f837eba364df3de2b6683d4eb5385333158'

---
 tests/wpt/metadata/MANIFEST.json              | 860 ++++++++++++------
 .../CSS2/floats/hit-test-floats-002.html.ini  |   3 -
 .../line-height-interpolation.html.ini        |  80 ++
 .../inline-negative-margin-001.html.ini       |   5 +-
 ...block-in-inline-hittest-float-002.html.ini |   3 +
 ...k-in-inline-hittest-relpos-zindex.html.ini |   3 -
 .../visibility-interpolation.html.ini         |   8 +
 .../column-gap-interpolation.html.ini         |  26 +
 .../animation/row-gap-interpolation.html.ini  |  26 +
 .../background-size-interpolation.html.ini    |  35 +
 .../border-image-slice-interpolation.html.ini |  44 +
 .../border-image-width-interpolation.html.ini |  62 ++
 .../box-shadow-interpolation.html.ini         |   9 +
 .../flex-basis-interpolation.html.ini         |  17 +
 .../hittest-anonymous-box.html.ini            |   3 -
 .../font-size-adjust-interpolation.html.ini   |  45 +
 ...-variation-settings-interpolation.html.ini |  44 +
 ...t-negative-resolution-rendering-2.html.ini |   2 +
 ...set-negative-resolution-rendering.html.ini |   2 +
 .../image-set/image-set-parsing.html.ini      |  48 +
 ...e-set-zero-resolution-rendering-2.html.ini |   2 -
 ...age-set-zero-resolution-rendering.html.ini |   2 -
 .../tab-size-interpolation.html.ini           |   8 +
 .../text-indent-interpolation.html.ini        |  17 +
 .../text-align-last-interpolation.html.ini    |  36 +
 .../text-justify-interpolation.html.ini       |  36 +
 .../text-wrap-balance-dynamic-001.html.ini    |   2 +
 ...space-separators-break-spaces-005.html.ini |   2 -
 ...space-separators-break-spaces-012.html.ini |   2 -
 .../perspective-interpolation.html.ini        |  27 +
 .../all-with-discrete.tentative.html.ini      |   6 +
 .../vertical-align-interpolation.html.ini     |  27 +
 .../animations/z-index-interpolation.html.ini |  26 +
 .../display-none-no-animations.html.ini       |   3 +
 .../accent-color-interpolation.html.ini       |  18 +
 .../caret-color-interpolation.html.ini        |  17 +
 ...calc-infinity-nan-serialize-angle.html.ini |   9 +
 .../hypot-pow-sqrt-computed.html.ini          |  21 +
 .../hypot-pow-sqrt-serialize.html.ini         |  24 +
 ...elementFromPoint-dynamic-anon-box.html.ini |   3 +
 ...tFromPoint-ellipsis-in-inline-box.html.ini |   3 -
 .../elementFromPoint-subpixel.html.ini        |   3 +
 .../elementsFromPoint-invalid-cases.html.ini  |   3 +
 ...backdrop-filter-interpolation-001.html.ini |   8 +
 ...backdrop-filter-interpolation-002.html.ini |   8 +
 ...backdrop-filter-interpolation-003.html.ini |   8 +
 .../filter-interpolation-002.html.ini         |   8 +
 .../filter-interpolation-003.html.ini         |  17 +
 .../nth-child-of-attr-largedom.html.ini       |   2 +
 .../srcdoc/consecutive-srcdoc.html.ini        |   5 +-
 .../navigating-across-documents/005.html.ini  |   1 +
 .../replace-before-load/a-click.html.ini      |   3 -
 ...creating_browsing_context_test_01.html.ini |   3 -
 ...d.conformance.requirements.basics.html.ini |   3 +-
 .../2d.fillRect.shadow.html.ini               |   4 +-
 .../2d.strokeRect.shadow.html.ini             |   4 +-
 ...rObject.blur.exceptions.tentative.html.ini |   3 +-
 ...ilterObject.colorMatrix.tentative.html.ini |   3 +-
 ...ponentTransfer.discrete.tentative.html.ini |   3 +-
 ...componentTransfer.gamma.tentative.html.ini |   3 +-
 ...ponentTransfer.identity.tentative.html.ini |   3 +-
 ...omponentTransfer.linear.tentative.html.ini |   3 +-
 ...componentTransfer.table.tentative.html.ini |   3 +-
 ...nvolveMatrix.exceptions.tentative.html.ini |   3 +-
 ...lter.canvasFilterObject.tentative.html.ini |   3 +-
 ...t.turbulence.inputTypes.tentative.html.ini |   3 +-
 .../filters/2d.filter.value.html.ini          |   3 +-
 .../2d.imageData.create2.nonfinite.html.ini   |   4 +-
 .../2d.imageData.get.large.crash.html.ini     |   2 +
 ...2d.imageData.get.large.crash.worker.js.ini |   4 +
 .../2d.imageData.get.nonfinite.html.ini       |   4 +-
 .../2d.imageData.get.source.outside.html.ini  |   4 +-
 .../2d.imageData.put.nonfinite.html.ini       |   4 +-
 .../2d.imageData.put.unchanged.html.ini       |   4 +-
 .../2d.color.space.p3.to.p3.html.ini          |   3 +-
 .../supported-elements.html.ini               |  12 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |   3 +-
 .../non-active-document.html.ini              |   6 +
 .../dialog-form-submission-unusual.html.ini   |   6 +
 .../parsing/DOMContentLoaded-defer.html.ini   |   3 -
 .../module-tla-delayed.html.ini               |   3 +
 tests/wpt/metadata/url/failure.html.ini       |   9 +
 .../url/url-setters-a-area.window.js.ini      |  24 +
 .../cross-partition.https.tentative.html.ini  |   2 +-
 .../webmessaging/with-ports/017.html.ini      |   4 -
 .../webmessaging/without-ports/017.html.ini   |   4 -
 ...s-3P-window.partitioned.tentative.html.ini |   4 +
 .../metadata/xhr/send-timeout-events.htm.ini  |   2 +
 .../mozilla/meta/mozilla/scrollBy.html.ini    |   3 -
 .../crashtests/aria-owns-presentation.html    |   3 +
 .../wpt/web-platform-tests/accname/basic.html |  22 +
 ...-animation-fallback-additive-keyframe.html |   2 +-
 .../background-color-animation-with-blur.html |   2 +-
 ...ckground-color-animation-diff-length1.html |   2 +-
 ...ckground-color-animation-diff-length2.html |   2 +-
 ...ckground-color-animation-diff-length3.html |   2 +-
 .../size-container-with-quotes-ref.html       |   3 +
 .../size-container-with-quotes.html           |  11 +
 ...-set-negative-resolution-rendering-2.html} |   7 +-
 ...age-set-negative-resolution-rendering.html |  15 +
 .../image-set/image-set-parsing.html          |  39 +-
 .../image-set-zero-resolution-rendering.html  |  16 -
 .../text-wrap-balance-dynamic-001-ref.html    |  16 +
 .../text-wrap-balance-dynamic-001.html        |  21 +
 .../all-with-discrete.tentative.html          |  51 ++
 .../display-none-no-animations.html           |  28 +
 .../calc-infinity-nan-serialize-angle.html    |   6 +-
 .../css-values/hypot-pow-sqrt-computed.html   |   8 +-
 .../css-values/hypot-pow-sqrt-serialize.html  |  14 +-
 .../animation/offset-interpolation.html       |  12 +-
 .../css/motion/offset-supports-calc.html      |   2 +-
 .../motion/parsing/offset-parsing-valid.html  |   2 +-
 .../motion/parsing/offset-path-computed.html  |   3 +-
 .../parsing/offset-path-parsing-invalid.html  |   1 -
 .../parsing/offset-path-parsing-valid.html    |   3 +-
 .../css/motion/parsing/offset-shorthand.html  |   4 +-
 .../nth-child-of-attr-largedom-ref.html       | 452 +++++++++
 .../nth-child-of-attr-largedom.html           | 462 ++++++++++
 .../css/support/interpolation-testcommon.js   |   2 +-
 .../docs/writing-tests/testdriver.md          |   7 +
 .../2d.imageData.create2.round.html           |  30 +
 .../2d.composite.globalAlpha.canvas.html      |   4 +-
 .../2d.composite.globalAlpha.canvascopy.html  |   4 +-
 ...d.composite.globalAlpha.canvaspattern.html |   4 +-
 .../2d.composite.globalAlpha.default.html     |   4 +-
 .../2d.composite.globalAlpha.fill.html        |   4 +-
 .../2d.composite.globalAlpha.image.html       |   4 +-
 ...2d.composite.globalAlpha.imagepattern.html |   4 +-
 .../2d.composite.globalAlpha.invalid.html     |   4 +-
 .../2d.composite.globalAlpha.range.html       |   4 +-
 .../2d.composite.operation.casesensitive.html |   4 +-
 .../2d.composite.operation.clear.html         |   4 +-
 .../2d.composite.operation.darker.html        |   4 +-
 .../2d.composite.operation.default.html       |   4 +-
 .../2d.composite.operation.get.html           |   4 +-
 .../2d.composite.operation.highlight.html     |   4 +-
 .../2d.composite.operation.nullsuffix.html    |   4 +-
 .../2d.composite.operation.over.html          |   4 +-
 .../2d.composite.operation.unrecognised.html  |   4 +-
 .../2d.conformance.requirements.basics.html   |   4 +-
 ....conformance.requirements.missingargs.html |   4 +-
 .../2d.drawImage.3arg.html                    |   4 +-
 .../2d.drawImage.5arg.html                    |   4 +-
 .../2d.drawImage.9arg.basic.html              |   4 +-
 .../2d.drawImage.9arg.destpos.html            |   4 +-
 .../2d.drawImage.9arg.destsize.html           |   4 +-
 .../2d.drawImage.9arg.sourcepos.html          |   4 +-
 .../2d.drawImage.9arg.sourcesize.html         |   4 +-
 .../2d.drawImage.alpha.html                   |   4 +-
 .../2d.drawImage.animated.poster.html         |   4 +-
 .../2d.drawImage.broken.html                  |   4 +-
 .../2d.drawImage.canvas.html                  |   4 +-
 .../2d.drawImage.clip.html                    |   4 +-
 .../2d.drawImage.composite.html               |   4 +-
 .../2d.drawImage.floatsource.html             |   4 +-
 .../2d.drawImage.negativedest.html            |   4 +-
 .../2d.drawImage.negativedir.html             |   4 +-
 .../2d.drawImage.negativesource.html          |   4 +-
 .../2d.drawImage.nonfinite.html               |   4 +-
 .../2d.drawImage.nowrap.html                  |   4 +-
 .../2d.drawImage.null.html                    |   4 +-
 .../2d.drawImage.path.html                    |   4 +-
 .../2d.drawImage.self.1.html                  |   4 +-
 .../2d.drawImage.self.2.html                  |   4 +-
 .../2d.drawImage.svg.html                     |   4 +-
 .../2d.drawImage.transform.html               |   4 +-
 .../2d.drawImage.wrongtype.html               |   4 +-
 .../2d.drawImage.zerocanvas.html              |   4 +-
 .../2d.drawImage.zerosource.html              |   4 +-
 .../2d.drawImage.zerosource.image.html        |   4 +-
 .../2d.clearRect.basic.html                   |   4 +-
 .../2d.clearRect.clip.html                    |   4 +-
 .../2d.clearRect.globalalpha.html             |   4 +-
 .../2d.clearRect.globalcomposite.html         |   4 +-
 .../2d.clearRect.negative.html                |   4 +-
 .../2d.clearRect.nonfinite.html               |   4 +-
 .../2d.clearRect.path.html                    |   4 +-
 .../2d.clearRect.shadow.html                  |   4 +-
 .../2d.clearRect.transform.html               |   4 +-
 .../2d.clearRect.zero.html                    |   4 +-
 .../2d.fillRect.basic.html                    |   4 +-
 .../2d.fillRect.clip.html                     |   4 +-
 .../2d.fillRect.negative.html                 |   4 +-
 .../2d.fillRect.nonfinite.html                |   4 +-
 .../2d.fillRect.path.html                     |   4 +-
 .../2d.fillRect.shadow.html                   |   4 +-
 .../2d.fillRect.transform.html                |   4 +-
 .../2d.fillRect.zero.html                     |   4 +-
 .../2d.strokeRect.basic.html                  |   4 +-
 .../2d.strokeRect.clip.html                   |   4 +-
 .../2d.strokeRect.globalalpha.html            |   4 +-
 .../2d.strokeRect.globalcomposite.html        |   4 +-
 .../2d.strokeRect.negative.html               |   4 +-
 .../2d.strokeRect.nonfinite.html              |   4 +-
 .../2d.strokeRect.path.html                   |   4 +-
 .../2d.strokeRect.shadow.html                 |   4 +-
 .../2d.strokeRect.transform.html              |   4 +-
 .../2d.strokeRect.zero.1.html                 |   4 +-
 .../2d.strokeRect.zero.2.html                 |   4 +-
 .../2d.strokeRect.zero.3.html                 |   4 +-
 .../2d.strokeRect.zero.4.html                 |   4 +-
 .../2d.strokeRect.zero.5.html                 |   4 +-
 ...ilterObject.blur.exceptions.tentative.html |   4 +-
 ...vasFilterObject.colorMatrix.tentative.html |   4 +-
 ....componentTransfer.discrete.tentative.html |   4 +-
 ...ect.componentTransfer.gamma.tentative.html |   4 +-
 ....componentTransfer.identity.tentative.html |   4 +-
 ...ct.componentTransfer.linear.tentative.html |   4 +-
 ...ect.componentTransfer.table.tentative.html |   4 +-
 ...t.convolveMatrix.exceptions.tentative.html |   4 +-
 ...d.filter.canvasFilterObject.tentative.html |   4 +-
 ...bject.turbulence.inputTypes.tentative.html |   4 +-
 .../offscreen/filters/2d.filter.value.html    |   4 +-
 .../line-styles/2d.line.cap.butt.html         |   4 +-
 .../line-styles/2d.line.cap.closed.html       |   4 +-
 .../line-styles/2d.line.cap.invalid.html      |   4 +-
 .../line-styles/2d.line.cap.open.html         |   4 +-
 .../line-styles/2d.line.cap.round.html        |   4 +-
 .../line-styles/2d.line.cap.square.html       |   4 +-
 .../line-styles/2d.line.cap.valid.html        |   4 +-
 .../offscreen/line-styles/2d.line.cross.html  |   4 +-
 .../line-styles/2d.line.defaults.html         |   4 +-
 .../2d.line.invalid.strokestyle.html          |   4 +-
 .../line-styles/2d.line.join.bevel.html       |   4 +-
 .../line-styles/2d.line.join.closed.html      |   4 +-
 .../line-styles/2d.line.join.invalid.html     |   4 +-
 .../line-styles/2d.line.join.miter.html       |   4 +-
 .../line-styles/2d.line.join.open.html        |   4 +-
 .../line-styles/2d.line.join.parallel.html    |   4 +-
 .../line-styles/2d.line.join.round.html       |   4 +-
 .../line-styles/2d.line.join.valid.html       |   4 +-
 .../line-styles/2d.line.miter.acute.html      |   4 +-
 .../line-styles/2d.line.miter.exceeded.html   |   4 +-
 .../line-styles/2d.line.miter.invalid.html    |   4 +-
 .../line-styles/2d.line.miter.lineedge.html   |   4 +-
 .../line-styles/2d.line.miter.obtuse.html     |   4 +-
 .../line-styles/2d.line.miter.rightangle.html |   4 +-
 .../line-styles/2d.line.miter.valid.html      |   4 +-
 .../line-styles/2d.line.miter.within.html     |   4 +-
 .../offscreen/line-styles/2d.line.union.html  |   4 +-
 .../line-styles/2d.line.width.basic.html      |   4 +-
 .../line-styles/2d.line.width.invalid.html    |   4 +-
 .../2d.line.width.scaledefault.html           |   4 +-
 .../2d.line.width.transformed.html            |   4 +-
 .../line-styles/2d.line.width.valid.html      |   4 +-
 .../2d.imageData.create1.basic.html           |   4 +-
 .../2d.imageData.create1.initial.html         |   4 +-
 .../2d.imageData.create1.zero.html            |   4 +-
 .../2d.imageData.create2.basic.html           |   4 +-
 .../2d.imageData.create2.double.html          |  34 +
 .../2d.imageData.create2.double.worker.js     |  28 +
 .../2d.imageData.create2.initial.html         |   4 +-
 .../2d.imageData.create2.large.html           |   4 +-
 .../2d.imageData.create2.negative.html        |   4 +-
 .../2d.imageData.create2.nonfinite.html       |   6 +-
 .../2d.imageData.create2.nonfinite.worker.js  |   2 +-
 .../2d.imageData.create2.round.html           |   4 +-
 .../2d.imageData.create2.zero.html            |   6 +-
 .../2d.imageData.create2.zero.worker.js       |   2 +
 .../2d.imageData.get.basic.html               |   4 +-
 .../2d.imageData.get.clamp.html               |   4 +-
 .../2d.imageData.get.double.html              |  34 +
 .../2d.imageData.get.double.worker.js         |  28 +
 .../2d.imageData.get.invalid.html             |  47 +
 .../2d.imageData.get.invalid.worker.js        |  41 +
 .../2d.imageData.get.large.crash.html         |  29 +
 .../2d.imageData.get.large.crash.worker.js    |  23 +
 .../2d.imageData.get.length.html              |   4 +-
 .../2d.imageData.get.nonfinite.html           |   6 +-
 .../2d.imageData.get.nonfinite.worker.js      |   2 +-
 .../2d.imageData.get.nonpremul.html           |   4 +-
 .../2d.imageData.get.order.alpha.html         |   4 +-
 .../2d.imageData.get.order.cols.html          |   4 +-
 .../2d.imageData.get.order.rgb.html           |   4 +-
 .../2d.imageData.get.order.rows.html          |   4 +-
 .../2d.imageData.get.range.html               |   4 +-
 .../2d.imageData.get.rounding.html            |  47 +
 .../2d.imageData.get.rounding.worker.js       |  41 +
 .../2d.imageData.get.source.negative.html     |   6 +-
 ...2d.imageData.get.source.negative.worker.js |   2 +
 .../2d.imageData.get.source.outside.html      |  11 +-
 .../2d.imageData.get.source.outside.worker.js |   7 +
 .../2d.imageData.get.source.size.html         |   4 +-
 .../2d.imageData.get.unaffected.html          |   4 +-
 .../2d.imageData.get.zero.html                |   8 +-
 .../2d.imageData.get.zero.worker.js           |   4 +
 .../2d.imageData.object.clamp.html            |   8 +-
 .../2d.imageData.object.clamp.worker.js       |   4 +
 .../2d.imageData.object.nan.html              |   4 +-
 .../2d.imageData.object.properties.html       |   4 +-
 .../2d.imageData.object.readonly.html         |   4 +-
 .../2d.imageData.object.round.html            |   4 +-
 .../2d.imageData.object.set.html              |   4 +-
 .../2d.imageData.object.string.html           |   4 +-
 .../2d.imageData.object.undefined.html        |   4 +-
 .../2d.imageData.put.alpha.html               |   4 +-
 .../2d.imageData.put.alpha.png                | Bin 0 -> 221 bytes
 .../2d.imageData.put.basic.html               |   4 +-
 .../2d.imageData.put.clip.html                |   4 +-
 .../2d.imageData.put.created.html             |   4 +-
 .../2d.imageData.put.cross.html               |   4 +-
 .../2d.imageData.put.dirty.negative.html      |   7 +-
 .../2d.imageData.put.dirty.negative.worker.js |   3 +
 .../2d.imageData.put.dirty.outside.html       |   8 +-
 .../2d.imageData.put.dirty.outside.worker.js  |   4 +
 .../2d.imageData.put.dirty.rect1.html         |   7 +-
 .../2d.imageData.put.dirty.rect1.worker.js    |   3 +
 .../2d.imageData.put.dirty.rect2.html         |   7 +-
 .../2d.imageData.put.dirty.rect2.worker.js    |   3 +
 .../2d.imageData.put.dirty.zero.html          |   4 +-
 .../2d.imageData.put.modified.html            |   4 +-
 .../2d.imageData.put.nonfinite.html           |   6 +-
 .../2d.imageData.put.nonfinite.worker.js      |   2 +-
 .../2d.imageData.put.null.html                |   4 +-
 .../2d.imageData.put.path.html                |   4 +-
 .../2d.imageData.put.unaffected.html          |   4 +-
 .../2d.imageData.put.unchanged.html           |   6 +-
 .../2d.imageData.put.unchanged.worker.js      |   2 +
 .../2d.imageData.put.wrongtype.html           |   4 +-
 .../2d.color.space.p3.to.p3.html              |   4 +-
 .../2d.color.space.p3.to.srgb.html            |   4 +-
 .../html/canvas/tools/templates-new.yaml      |   4 +-
 .../pixel-manipulation.yaml                   |  55 +-
 .../yaml/offscreen/pixel-manipulation.yaml    | 735 ---------------
 .../contentEditable-invalidvalue.html         |  16 -
 ...ble-enumerated-ascii-case-insensitive.html |  47 +-
 ...r-interaction-editing-contenteditable.html |  10 +
 .../dialog-form-submission-unusual.html       |  34 +
 .../semantics/popovers/popover-focus.html     |   2 +-
 .../popover-top-layer-interactions.html       |  25 +-
 .../tentative/loaf-iframe-popup.html          |  65 ++
 .../MediaRecorder-detached-context.html       |   2 +-
 .../MediaRecorder-error.html                  |  16 +-
 .../overconstrained_error.https.html          |  29 +
 .../resources/testdriver.js                   |  34 +
 .../getPorts/reject_opaque_origin.https.html  |  14 +
 .../reject_opaque_origin.https.html.headers   |   1 +
 .../getPorts/sandboxed_iframe.https.window.js |  22 +
 .../reject_opaque_origin.https.html           |  14 +
 .../reject_opaque_origin.https.html.headers   |   1 +
 .../sandboxed_iframe.https.window.js          |  26 +
 .../serial/resources/open-in-iframe.html      |  33 +
 .../shadow-dom/focus-within-shadow.html       |  29 +
 .../storage-access-api/helpers.js             |   6 +
 ...s-site-sibling-iframes.sub.https.window.js |  41 +-
 .../resources/echo-cookie-header.py           |  10 +-
 .../resources/embedded_responder.js           |   4 +
 ...js => enqueue-with-detached-buffer.any.js} |   4 +-
 .../tools/webdriver/webdriver/client.py       |   8 +
 .../webtransport/h3/webtransport_h3_server.py |   8 +
 .../web-platform-tests/tools/wpt/browser.py   |  26 +
 tests/wpt/web-platform-tests/tools/wpt/run.py |  14 +-
 .../wptrunner/wptrunner/browsers/__init__.py  |   1 +
 .../wptrunner/wptrunner/browsers/wktr.py      | 239 +++++
 .../wptrunner/wptrunner/executors/actions.py  |  30 +
 .../wptrunner/executors/executorwebdriver.py  |  13 +
 .../wptrunner/executors/executorwktr.py       | 268 ++++++
 .../wptrunner/wptrunner/executors/protocol.py |  21 +
 .../wptrunner/wptrunner/testdriver-extra.js   |  12 +
 .../wptrunner/testharnessreport-wktr.js       |  23 +
 .../url/resources/setters_tests.json          |  72 ++
 .../url/resources/toascii.json                |  17 -
 .../url/resources/urltestdata.json            |  31 +
 .../wai-aria/role/basic.html                  |  23 +
 .../webdriver/tests/bidi/network/__init__.py  |   9 -
 .../before_request_sent_tentative.py          |  13 +-
 .../response_completed_tentative.py           |   9 +-
 .../response_started_tentative.py             |   8 +-
 ...RtpTransceiver-headerExtensionControl.html |  80 +-
 369 files changed, 4941 insertions(+), 1492 deletions(-)
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering-2.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering-2.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/text-wrap-balance-dynamic-001.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transitions/all-with-discrete.tentative.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transitions/display-none-no-animations.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata/css/selectors/invalidation/nth-child-of-attr-largedom.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
 create mode 100644 tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini
 create mode 100644 tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini
 create mode 100644 tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html.ini
 delete mode 100644 tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 create mode 100644 tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
 create mode 100644 tests/wpt/metadata/xhr/send-timeout-events.htm.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
 create mode 100644 tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-presentation.html
 create mode 100644 tests/wpt/web-platform-tests/accname/basic.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes.html
 rename tests/wpt/web-platform-tests/css/css-images/image-set/{image-set-zero-resolution-rendering-2.html => image-set-negative-resolution-rendering-2.html} (65%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transitions/all-with-discrete.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transitions/display-none-no-animations.html
 create mode 100644 tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js
 create mode 100644 tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png
 rename tests/wpt/web-platform-tests/html/canvas/tools/{yaml/element => yaml-new}/pixel-manipulation.yaml (96%)
 delete mode 100644 tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/pixel-manipulation.yaml
 delete mode 100644 tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html
 create mode 100644 tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html
 create mode 100644 tests/wpt/web-platform-tests/mediacapture-streams/overconstrained_error.https.html
 create mode 100644 tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html
 create mode 100644 tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/serial/getPorts/sandboxed_iframe.https.window.js
 create mode 100644 tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html
 create mode 100644 tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/serial/requestPort/sandboxed_iframe.https.window.js
 create mode 100644 tests/wpt/web-platform-tests/serial/resources/open-in-iframe.html
 create mode 100644 tests/wpt/web-platform-tests/shadow-dom/focus-within-shadow.html
 rename tests/wpt/web-platform-tests/streams/readable-byte-streams/{enqueue-with-detached-buffer.window.js => enqueue-with-detached-buffer.any.js} (88%)
 create mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/wktr.py
 create mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwktr.py
 create mode 100644 tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js
 create mode 100644 tests/wpt/web-platform-tests/wai-aria/role/basic.html

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 15ef241d434..45ef9dee917 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -56,6 +56,13 @@
        {}
       ]
      ],
+     "aria-owns-presentation.html": [
+      "138625a1534faca65cb00ff3d615dc4fb3fc080b",
+      [
+       null,
+       {}
+      ]
+     ],
      "aria-owns-reparent.html": [
       "2eaceb66f6957b0240a4f02b0c23b74e8ca4921a",
       [
@@ -127985,7 +127992,7 @@
        ]
       ],
       "background-color-animation-fallback-additive-keyframe.html": [
-       "d4d3acf31e6d4f248c35fbef2c6a05b26be6ce77",
+       "6bb1b8257e73eb7b53969feb1d70f2299e063019",
        [
         null,
         [
@@ -128167,7 +128174,7 @@
        ]
       ],
       "background-color-animation-with-blur.html": [
-       "0685e5a7c2a4fea78e06c3c452816a8a4e31c999",
+       "86e97b0f7e9538e40d40aef41cd59b9185c57428",
        [
         null,
         [
@@ -128432,7 +128439,7 @@
        ]
       },
       "two-background-color-animation-diff-length1.html": [
-       "b584ed835c7a66764c0fce057d777faf851a558c",
+       "d49ac0828c089f6e561767466b4f9cc1973c345f",
        [
         null,
         [
@@ -128445,7 +128452,7 @@
        ]
       ],
       "two-background-color-animation-diff-length2.html": [
-       "c6822dec4cbe6f16126f1ef141a7eafc2765a6ff",
+       "979414db263966b58c7ae74f83dfdd13b2aa9586",
        [
         null,
         [
@@ -128458,7 +128465,7 @@
        ]
       ],
       "two-background-color-animation-diff-length3.html": [
-       "e12d8a7fd2ae3c1c8e24edc6eafae63bbe753783",
+       "b727f5c64fa09da695084d73333a63c983a9639e",
        [
         null,
         [
@@ -155829,6 +155836,19 @@
         {}
        ]
       ],
+      "size-container-with-quotes.html": [
+       "b88f882cd043195bb4f1b323c369515fe6107e36",
+       [
+        null,
+        [
+         [
+          "/css/css-contain/container-queries/size-container-with-quotes-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "svg-foreignobject-no-size-container.html": [
        "38fc493a16259bec9091850aed09fbeeae313187",
        [
@@ -190004,6 +190024,32 @@
         {}
        ]
       ],
+      "image-set-negative-resolution-rendering-2.html": [
+       "d506c364e3b535286f0c146867afc942d6d9706c",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-set/reference/image-set-rendering-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "image-set-negative-resolution-rendering.html": [
+       "36fa08901ba264f61231495429ec774eb62d03a0",
+       [
+        null,
+        [
+         [
+          "/css/reference/blank.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "image-set-no-res-rendering-2.html": [
        "f588980be330d1aeb00793275fbcc96e13d3626a",
        [
@@ -190263,32 +190309,6 @@
         ],
         {}
        ]
-      ],
-      "image-set-zero-resolution-rendering-2.html": [
-       "5c835a3fbcc8b4304d4bf13ff4bd037d8f518dd7",
-       [
-        null,
-        [
-         [
-          "/css/css-images/image-set/reference/image-set-rendering-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
-      ],
-      "image-set-zero-resolution-rendering.html": [
-       "d7e4eb7fdc25af16c17e9e7549f67389afea3285",
-       [
-        null,
-        [
-         [
-          "/css/css-images/image-set/reference/image-set-rendering-ref.html",
-          "=="
-         ]
-        ],
-        {}
-       ]
       ]
      },
      "infinite-radial-gradient-refcrash.html": [
@@ -241920,6 +241940,19 @@
         {}
        ]
       ],
+      "text-wrap-balance-dynamic-001.html": [
+       "8c7d27d1a347407c82f0602bba105982764729e3",
+       [
+        null,
+        [
+         [
+          "/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "textarea-break-spaces-001.html": [
        "ad81e99768f9816c6e8a659c13aed81c4f22d940",
        [
@@ -298245,6 +298278,19 @@
         {}
        ]
       ],
+      "nth-child-of-attr-largedom.html": [
+       "76bc4542dae30ec1d7cbd4856875dc63def90015",
+       [
+        null,
+        [
+         [
+          "/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "nth-child-of-attr.html": [
        "d929d6a50db02d3e34d024d83200649573ca20a4",
        [
@@ -368779,6 +368825,10 @@
        "2a87df85b7aba82588c984e7c41132feb777f427",
        []
       ],
+      "size-container-with-quotes-ref.html": [
+       "e1822fa544ec91a113eaa911f69243d767eaf5cc",
+       []
+      ],
       "support": {
        "cq-testcommon.js": [
         "2eaca1dd091cbf7c3a406fa02c2696d7a9c258e4",
@@ -392958,6 +393008,10 @@
         "e522e3711c9d1a68f6a90d97cba248ecb4e47d32",
         []
        ],
+       "text-wrap-balance-dynamic-001-ref.html": [
+        "43202e4d97f03c1694176f5c6a95b4a48e938a96",
+        []
+       ],
        "textarea-pre-wrap-001-ref.html": [
         "31070ea92815e4d3a3ece48ed69da03de02f671e",
         []
@@ -402487,6 +402541,10 @@
        "f28d358cdc53d71501fd35c0c6dc2db41e042b2b",
        []
       ],
+      "nth-child-of-attr-largedom-ref.html": [
+       "6ddc204b83aa8e21d2275352a3aac238bb3baa62",
+       []
+      ],
       "nth-child-of-attr-ref.html": [
        "41205174eb0ad5bfca3189f6e03912530c990f9e",
        []
@@ -402917,7 +402975,7 @@
       []
      ],
      "interpolation-testcommon.js": [
-      "aa8239ae928654b903dff5ae5a7e3e8c57826846",
+      "283a2d8aaba88802cc451978ba6396078364c47d",
       []
      ],
      "numeric-testcommon.js": [
@@ -403753,7 +403811,7 @@
       []
      ],
      "testdriver.md": [
-      "11193b147f038f21cca04cda883d07e8ed9d4832",
+      "24159e82cc8ec3b21bb929f676e944c39dcee641",
       []
      ],
      "testharness-api.md": [
@@ -412979,6 +413037,12 @@
         ]
        }
       },
+      "pixel-manipulation": {
+       "2d.imageData.put.alpha.png": [
+        "5428c65524eebf083e2772bd66b496eeb1c1745e",
+        []
+       ]
+      },
       "text": {
        "2d.text.draw.fill.basic.png": [
         "70d7b046cb226cfcb2bfeebe3477d3b580d8270a",
@@ -413078,7 +413142,7 @@
        []
       ],
       "templates-new.yaml": [
-       "eaaf6efac88901f9c690c3d74a92887d748e90d5",
+       "0a2de9f0b43b240f1a08732891895554b1a8858c",
        []
       ],
       "templates.yaml": [
@@ -413103,10 +413167,6 @@
          "eec142c7692bc5fd14478fedcd4ed95c66a546cd",
          []
         ],
-        "pixel-manipulation.yaml": [
-         "eca8e8b2bdad14b7b7b102be8a8c5aad25986810",
-         []
-        ],
         "shadows.yaml": [
          "7a7c115a7c44d450fc60d2e5bbb544cc5c75d225",
          []
@@ -413141,10 +413201,6 @@
          "9c70daf59fca7fd33ea0a2256b7d1ce19f1fb192",
          []
         ],
-        "pixel-manipulation.yaml": [
-         "86f7940adda42700d736947b1bedf8f5d73dc9cd",
-         []
-        ],
         "shadows.yaml": [
          "06e2681c72c3d3832ce07fa85ff0362cd0bd5d03",
          []
@@ -413200,6 +413256,10 @@
         "604f4f3659a40b89b05f1bce3968f2580dce3c6f",
         []
        ],
+       "pixel-manipulation.yaml": [
+        "0ae664d2307960862f23582949d1b8f45e24a9a9",
+        []
+       ],
        "reset.yaml": [
         "4107166248a8a652fbc0441e3c4d30bf71bb4484",
         []
@@ -433894,7 +433954,7 @@
      []
     ],
     "testdriver.js": [
-     "76ae2834fdfb0a1e8341b4bf22c6eda7e1d1ff15",
+     "f8bb14c6e485131e0343e1a77dc51519294fd0fa",
      []
     ],
     "testdriver.js.headers": [
@@ -434313,6 +434373,18 @@
      "7040cf0a9d000d25367033a9ec5a5ebbb4690398",
      []
     ],
+    "getPorts": {
+     "reject_opaque_origin.https.html.headers": [
+      "1efcf8c226fac074c98d0a5a747856f532e5d84e",
+      []
+     ]
+    },
+    "requestPort": {
+     "reject_opaque_origin.https.html.headers": [
+      "1efcf8c226fac074c98d0a5a747856f532e5d84e",
+      []
+     ]
+    },
     "resources": {
      "automation.js": [
       "e88fdb1a9d23dfd601d5e9e6e11b560be07d577e",
@@ -434326,6 +434398,10 @@
       "ac19136b35acc43e7290131fd082657c58f1387b",
       []
      ],
+     "open-in-iframe.html": [
+      "9bf8beb66aa1c2514b591db508014572d1ec6b7e",
+      []
+     ],
      "serial-allowed-by-permissions-policy-worker.js": [
       "cef0aacdfc3d2f755b185439679706318935df17",
       []
@@ -437860,16 +437936,16 @@
      []
     ],
     "helpers.js": [
-     "d2ded9a946cd1044d72135ea4f5c1067a3bb414e",
+     "ddc638434aefb0217a4b4c2149d29d91d194a634",
      []
     ],
     "resources": {
      "echo-cookie-header.py": [
-      "546e76e509ad2a0b4527ed895b1deb95bfbbf3b4",
+      "f1599e3a89919adfe0a0de60515ef1d44a898190",
       []
      ],
      "embedded_responder.js": [
-      "fe33f3125fab7f65967101bcca02fd9ce54cdb45",
+      "ab1ab30f6964130e6c4d09655c77cca3095596a4",
       []
      ],
      "hasStorageAccess-iframe.html": [
@@ -447612,7 +447688,7 @@
        ]
       },
       "client.py": [
-       "030e3fc56bede691a8d14e6bac2ae2f9edd57733",
+       "ba01e1fe8668de8e889cb237e1c6615c5fdffdb9",
        []
       ],
       "error.py": [
@@ -447660,7 +447736,7 @@
        []
       ],
       "webtransport_h3_server.py": [
-       "ea0267d3d32d89e5101e1ef2b4915a9a17c71b76",
+       "9d62f09926f9fda9a284f943dd5f35cda47dcae0",
        []
       ]
      },
@@ -447679,7 +447755,7 @@
       []
      ],
      "browser.py": [
-      "66796a8968d9b9742c024c31eba1135f0989358b",
+      "7d789f6a71c7e820c7f4b7deccda9bb19df22b01",
       []
      ],
      "commands.json": [
@@ -447715,7 +447791,7 @@
       []
      ],
      "run.py": [
-      "468bea3c51fe6dd0f37ecae9bf40e0bcc35e8bd5",
+      "0b7d73b204247f9b2d8481591983bd31c5ccc3b8",
       []
      ],
      "testfiles.py": [
@@ -447917,7 +447993,7 @@
       ],
       "browsers": {
        "__init__.py": [
-        "b2a53ca23a7b7d45fa60255888c49e07e3743dac",
+        "9724bb957b5e3c7d1a9e1506c7e710742038c916",
         []
        ],
        "android_weblayer.py": [
@@ -448021,6 +448097,10 @@
        "webkitgtk_minibrowser.py": [
         "a574328c32633126fd7430c4757f3c6169f12ccd",
         []
+       ],
+       "wktr.py": [
+        "8d429f357b33f1ddba519855745729a1941a85ae",
+        []
        ]
       },
       "config.py": [
@@ -448037,7 +448117,7 @@
         []
        ],
        "actions.py": [
-        "a4b689ba921777b0c3e2a4835ad799d8ee758ba8",
+        "6a4a0b889e4ce082af7ea398b7b0f8242783ca99",
         []
        ],
        "base.py": [
@@ -448069,7 +448149,11 @@
         []
        ],
        "executorwebdriver.py": [
-        "54a571799995b47bd5d51a8882e3be3b16e72001",
+        "829eca0deb51fd5a99293b0302cc0c284b2e8f6b",
+        []
+       ],
+       "executorwktr.py": [
+        "ab94000fa209c2e864271ec4d9f091c88d83c851",
         []
        ],
        "process.py": [
@@ -448077,7 +448161,7 @@
         []
        ],
        "protocol.py": [
-        "75e113c71d3f3bbe0f3da93ac4906dffe9d6660b",
+        "af64cc855e2126c1503ad4a83c2215a23abe416a",
         []
        ],
        "pytestrunner": {
@@ -448192,7 +448276,7 @@
        []
       ],
       "testdriver-extra.js": [
-       "94a9a97125625ec37de586be2012877e1c66aedd",
+       "716da040bbc508e2c1880c4ee64b8afdae526ea1",
        []
       ],
       "testdriver-vendor.js": [
@@ -448215,6 +448299,10 @@
        "7819538dbb8f4a807d5db2649c2540854996c865",
        []
       ],
+      "testharnessreport-wktr.js": [
+       "b7d350a4262cb6f0d38337b17311fea7bd73eb70",
+       []
+      ],
       "testharnessreport.js": [
        "d385692445c5086d0ad4815926b7b2c2a93dd493",
        []
@@ -449567,15 +449655,15 @@
       []
      ],
      "setters_tests.json": [
-      "d040d081c6d4674df5446ebd5ca77974cf415fb3",
+      "347caf49ab0520fc855b1ce51661498deee1c35e",
       []
      ],
      "toascii.json": [
-      "4cb41e94cd4a0f35da2102b71b3144ce2d51a497",
+      "bca28b4a1e454a8c9ac74a94f6498fda1f6d75ba",
       []
      ],
      "urltestdata.json": [
-      "19f9ecddbee1873d613a2bb4e3e7b7cde04fe78e",
+      "eb414860f27c75e104aaf21c26b64f7cc185112d",
       []
      ]
     },
@@ -451475,7 +451563,7 @@
       },
       "network": {
        "__init__.py": [
-        "d0451d0f285336f7e32209bfd878aebbf018ffa2",
+        "ea7472cfd3d7b7368e051ab7592c3774b80b8a40",
         []
        ],
        "before_request_sent": {
@@ -470734,6 +470822,17 @@
      ]
     ]
    },
+   "accname": {
+    "basic.html": [
+     "0df93c87996d1ce08cb7feaea9c9a8ac1283d2db",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ]
+   },
    "acid": {
     "acid3": {
      "numbered-tests.html": [
@@ -503114,7 +503213,7 @@
        ]
       ],
       "image-set-parsing.html": [
-       "477a3f81215c67daeacab8520d79250e5edfd565",
+       "539d6d8c2f0746ae941ba6ada588078487c4b4de",
        [
         null,
         {}
@@ -514679,6 +514778,13 @@
        {}
       ]
      ],
+     "all-with-discrete.tentative.html": [
+      "f12c14e4c55285fd0d5a4c541c7b8b37146165b0",
+      [
+       null,
+       {}
+      ]
+     ],
      "animations": {
       "change-duration-during-transition.html": [
        "cf03f2e1207988fbdb8df6e884422b43f9acc012",
@@ -514800,6 +514906,13 @@
        {}
       ]
      ],
+     "display-none-no-animations.html": [
+      "32535baf9c7b1a297de487ade51b2d9498f2e926",
+      [
+       null,
+       {}
+      ]
+     ],
      "event-dispatch.tentative.html": [
       "5ed01cdd2588d1a5a5226a9abb46f60dd441ed13",
       [
@@ -518397,7 +518510,7 @@
       ]
      ],
      "calc-infinity-nan-serialize-angle.html": [
-      "884cc611056252d8522c3ceaa64db227ef18983b",
+      "67feefe51270480c8aef79b37a8415e37cbf87e4",
       [
        null,
        {}
@@ -518600,7 +518713,7 @@
       ]
      ],
      "hypot-pow-sqrt-computed.html": [
-      "aa4ec22edf2ff32fa5ad129e0cdeb0ca4d6e8fb1",
+      "3cc85a5230ca8dfc6310daf76ae89278a364169f",
       [
        null,
        {}
@@ -518614,7 +518727,7 @@
       ]
      ],
      "hypot-pow-sqrt-serialize.html": [
-      "d3a0bc607399bf047cebfab46d74aeb4bbd429a2",
+      "ab8c28cc5924492f014c760f272e39b07bb95373",
       [
        null,
        {}
@@ -522841,7 +522954,7 @@
        ]
       ],
       "offset-interpolation.html": [
-       "2ee011bd77a975e9b566d24658995693c574f620",
+       "9c3747185dc8305cc6ce26422bfc5d95ebb62ff1",
        [
         null,
         {}
@@ -522933,7 +523046,7 @@
       ]
      ],
      "offset-supports-calc.html": [
-      "907694f7fc32ebb1c44787fcfbf5980627d2919e",
+      "54414be0643abb097b29aed28d2bd96ab2c24f23",
       [
        null,
        {}
@@ -522990,28 +523103,28 @@
        ]
       ],
       "offset-parsing-valid.html": [
-       "992233d5a74b5a0bc801ae4a8257029450d3abb4",
+       "3ec10a7918f4c54197801a854df8a325b878af7a",
        [
         null,
         {}
        ]
       ],
       "offset-path-computed.html": [
-       "79d6022cc9f10711fe830abb861e71459646ca65",
+       "6fc2fa483f4c4706ca599691beedb784fb0b57ec",
        [
         null,
         {}
        ]
       ],
       "offset-path-parsing-invalid.html": [
-       "c69f7c81a9d479c2334769b85d0553f659b8bd83",
+       "949e45d828f102b8c3298a4d75ecc0a66c727a6b",
        [
         null,
         {}
        ]
       ],
       "offset-path-parsing-valid.html": [
-       "fce99f572e9c5c1c01bcf2f27f37e344f91b7ef3",
+       "db55250a6c74c126b750658d662f6fe3aab7b907",
        [
         null,
         {}
@@ -523060,7 +523173,7 @@
        ]
       ],
       "offset-shorthand.html": [
-       "611a394b8b17f5da5d75128a5be8acfba7e0fcbe",
+       "5e38b8c459c0265bfef5a29340608137dae6e54a",
        [
         null,
         {}
@@ -575414,6 +575527,13 @@
          {}
         ]
        ],
+       "2d.imageData.create2.round.html": [
+        "045cd0610cae9512cce406fef7f2248921edf63d",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.imageData.create2.this.html": [
         "1937609c8783a52d45b6e13a196ed136cb94555f",
         [
@@ -577150,7 +577270,7 @@
         ]
        ],
        "2d.composite.globalAlpha.canvas.html": [
-        "cd05d7b57b1f10a2a0bf6b0f792aa7d426a9198a",
+        "90825d29d246268b39f837cf157f729022f5fb6f",
         [
          null,
          {}
@@ -577164,7 +577284,7 @@
         ]
        ],
        "2d.composite.globalAlpha.canvascopy.html": [
-        "52a431cfaa1d740c9828b01a9812a14b8e73372f",
+        "15db07d6c1e6e918092820f0342706113247c62e",
         [
          null,
          {}
@@ -577178,7 +577298,7 @@
         ]
        ],
        "2d.composite.globalAlpha.canvaspattern.html": [
-        "24d7a0fc3cddce64dc1dcb81609908745c00b434",
+        "f6ce643bc8ac3c592210e8d3a73a0c4cb51b94aa",
         [
          null,
          {}
@@ -577192,7 +577312,7 @@
         ]
        ],
        "2d.composite.globalAlpha.default.html": [
-        "6604d5647d365c88907b5196d2f2bd57a6e25a11",
+        "3d6983f90ce95f893c4b9ffe40dedce5bca01d10",
         [
          null,
          {}
@@ -577206,7 +577326,7 @@
         ]
        ],
        "2d.composite.globalAlpha.fill.html": [
-        "e349b92376ba1d214884f11bfee31b489ac088ea",
+        "f2410facc071add961ab5d621ac487181fc6d575",
         [
          null,
          {}
@@ -577220,7 +577340,7 @@
         ]
        ],
        "2d.composite.globalAlpha.image.html": [
-        "29a963a7c6f542c55d7f100a6a49b90c5424df20",
+        "32c690d9784eb3acd9739eb82d237bcf72de02b1",
         [
          null,
          {}
@@ -577234,7 +577354,7 @@
         ]
        ],
        "2d.composite.globalAlpha.imagepattern.html": [
-        "7eacf16c4fce067af07d4d1923aacf5b72fba45b",
+        "f057141895de4b578f926698f352c543743bc448",
         [
          null,
          {}
@@ -577248,7 +577368,7 @@
         ]
        ],
        "2d.composite.globalAlpha.invalid.html": [
-        "d00951e46e55fadab579ac9d5acf9e9765aa62d5",
+        "a4149ced9f28e43efe7dab4f531099999f2bebe2",
         [
          null,
          {}
@@ -577262,7 +577382,7 @@
         ]
        ],
        "2d.composite.globalAlpha.range.html": [
-        "29efb63aadfd4e69d556e60ef587ad7772ef27a7",
+        "05736827be7c3f6ecb6a548ffd5d40b46f8d9b82",
         [
          null,
          {}
@@ -577430,7 +577550,7 @@
         ]
        ],
        "2d.composite.operation.casesensitive.html": [
-        "a317e7cf60614091e3309345c09725ba6ccbd7a3",
+        "f70fad638c2cb4ce481ea5987a240135edb683bd",
         [
          null,
          {}
@@ -577444,7 +577564,7 @@
         ]
        ],
        "2d.composite.operation.clear.html": [
-        "c838cf3f83ac2b171486331a22031d3c2e9d4832",
+        "0ffbc9eb2e606f48e038ad6d933a83783e3bf866",
         [
          null,
          {}
@@ -577458,7 +577578,7 @@
         ]
        ],
        "2d.composite.operation.darker.html": [
-        "1439cbbf41b6a4ce47e1f3a9e03bf5d7f13be988",
+        "f4240b4e6e11450c303155a8057adf21790ae4cb",
         [
          null,
          {}
@@ -577472,7 +577592,7 @@
         ]
        ],
        "2d.composite.operation.default.html": [
-        "f6a9d162cabbf45fbc2fe2a2ea47fa025f17c5fd",
+        "b18d17b585a352ef883d0dce7c9cbcf327a8b75d",
         [
          null,
          {}
@@ -577486,7 +577606,7 @@
         ]
        ],
        "2d.composite.operation.get.html": [
-        "0b3226c279e3d8535205d122668ed4032161f088",
+        "ff12aa593e2479182b2cc999139ae207ced4169c",
         [
          null,
          {}
@@ -577500,7 +577620,7 @@
         ]
        ],
        "2d.composite.operation.highlight.html": [
-        "bffe7b4edbe486e79e6e90263e9dedccb8c33d77",
+        "175d7184bad5f124e34b58e4b468273a80b49336",
         [
          null,
          {}
@@ -577514,7 +577634,7 @@
         ]
        ],
        "2d.composite.operation.nullsuffix.html": [
-        "72e83fcf80c7824f75a020f145b9bef8bfd1fbac",
+        "6572003dc3b959f44977fc4e415b141e48466be1",
         [
          null,
          {}
@@ -577528,7 +577648,7 @@
         ]
        ],
        "2d.composite.operation.over.html": [
-        "0400d974c4115a62afbc7cf45eff93c0b3d73d38",
+        "950ca3d687b69aa88dfadca2a6a5f6e727a590d4",
         [
          null,
          {}
@@ -577542,7 +577662,7 @@
         ]
        ],
        "2d.composite.operation.unrecognised.html": [
-        "1bcc764721d0744c60b89bd031b3c0e592d006b2",
+        "31a4639056c3feb2dbb19aa19641e79b892adc12",
         [
          null,
          {}
@@ -578156,7 +578276,7 @@
       },
       "conformance-requirements": {
        "2d.conformance.requirements.basics.html": [
-        "a89ec10f9b5ff8816962e42b119dc03785d1b203",
+        "6846bd89477d56828a7494b06c37e2fd484c6694",
         [
          null,
          {}
@@ -578170,7 +578290,7 @@
         ]
        ],
        "2d.conformance.requirements.missingargs.html": [
-        "cfbbca9e5e2da618e9d51f72e6606c0df46b97ea",
+        "e6930c0ac5f3b3a411f4877e1e001b5ecf2a8695",
         [
          null,
          {}
@@ -578186,7 +578306,7 @@
       },
       "drawing-images-to-the-canvas": {
        "2d.drawImage.3arg.html": [
-        "8e144b1ba6b81fad3d62219ea44c8438e199758b",
+        "a371d91431b8e771dbe2f77ac92e38822f17f662",
         [
          null,
          {
@@ -578210,7 +578330,7 @@
         ]
        ],
        "2d.drawImage.5arg.html": [
-        "c383d1a41729990d892bb4737e6a861139be395a",
+        "18ae25d829c48bd5ef7ef0b57efb0c343c57b808",
         [
          null,
          {
@@ -578234,7 +578354,7 @@
         ]
        ],
        "2d.drawImage.9arg.basic.html": [
-        "72ffb4ee3b698faf94069f58dd61e96ab4fcb413",
+        "e7034126cf900c2268e3498bcef475868b13f260",
         [
          null,
          {
@@ -578258,7 +578378,7 @@
         ]
        ],
        "2d.drawImage.9arg.destpos.html": [
-        "ddfa0cbf7cd112da15d86dff1be35e1280647646",
+        "079a57ddbc1cfc5df2ca18b206b64bbd9eef4a21",
         [
          null,
          {
@@ -578282,7 +578402,7 @@
         ]
        ],
        "2d.drawImage.9arg.destsize.html": [
-        "d94daa861e00f87d4b4168fc45c27ae47e591562",
+        "1996227c352df0fe7f2ce10b8127e0245628d117",
         [
          null,
          {
@@ -578306,7 +578426,7 @@
         ]
        ],
        "2d.drawImage.9arg.sourcepos.html": [
-        "ffd60f5da94190804de5ef85f2560e9a2679624d",
+        "ce6c758b3c801797282da0d09ccc947d643d497e",
         [
          null,
          {
@@ -578330,7 +578450,7 @@
         ]
        ],
        "2d.drawImage.9arg.sourcesize.html": [
-        "91962b671b149d791df7ea4bc0c9fb4a77885413",
+        "89acdb8e3621ed1fecc2e44f1478d3c5a88a1c2a",
         [
          null,
          {
@@ -578354,7 +578474,7 @@
         ]
        ],
        "2d.drawImage.alpha.html": [
-        "505c3fde5d1148b028e8bdfbdbffed60fdd425dc",
+        "eb8476f7c3a1ddc2bdf25a46840f10ac7e2ba6e3",
         [
          null,
          {
@@ -578378,7 +578498,7 @@
         ]
        ],
        "2d.drawImage.animated.poster.html": [
-        "59d79fd7174df6c76ba56e1430cc7f66fcffcd06",
+        "ea4205abd448fdb477a82cc5881033dfc710427d",
         [
          null,
          {
@@ -578402,7 +578522,7 @@
         ]
        ],
        "2d.drawImage.broken.html": [
-        "3324bebcbf947b8ee8d9addad9567ee6753cd71c",
+        "37aae52a53985249a8a1d6cc1b93d2c9d58be209",
         [
          null,
          {
@@ -578426,7 +578546,7 @@
         ]
        ],
        "2d.drawImage.canvas.html": [
-        "9b128710866e19112c5daf33ec27ec8a5ac77c15",
+        "dc144cb6f9dccc741f04485dea6b183d85d99b6d",
         [
          null,
          {
@@ -578450,7 +578570,7 @@
         ]
        ],
        "2d.drawImage.clip.html": [
-        "fa31852158517fcc82d6e810824c61976848c833",
+        "970cb4d5a5a47a0c97fda39011f6d9b50662400e",
         [
          null,
          {
@@ -578474,7 +578594,7 @@
         ]
        ],
        "2d.drawImage.composite.html": [
-        "de4ea40d7d712b972e57711143d521bf2b691a90",
+        "90afbcbda8b59f9ae211062b3f506295cbc73e86",
         [
          null,
          {
@@ -578498,7 +578618,7 @@
         ]
        ],
        "2d.drawImage.floatsource.html": [
-        "5f729737827493892b2926b1692becad31815f78",
+        "c6a3fbcf005df07513cd43a66b638abf55300ef5",
         [
          null,
          {
@@ -578522,7 +578642,7 @@
         ]
        ],
        "2d.drawImage.negativedest.html": [
-        "5851fcfb03c56a88fc5096206a27cbe47c22b9d7",
+        "1c207673963954f381469bfb98f330aeed491ca2",
         [
          null,
          {
@@ -578546,7 +578666,7 @@
         ]
        ],
        "2d.drawImage.negativedir.html": [
-        "f9d820733d0e6fe0f4319a71ef0851dcb30ab845",
+        "af274bf9bcd1803711c2de62dcccb05d135e314d",
         [
          null,
          {
@@ -578570,7 +578690,7 @@
         ]
        ],
        "2d.drawImage.negativesource.html": [
-        "9c2a2a1b103286d726bd42845f055ec8cfa28f56",
+        "5a7b2af7f2a98660530944e34f2cac375b359a3c",
         [
          null,
          {
@@ -578594,7 +578714,7 @@
         ]
        ],
        "2d.drawImage.nonfinite.html": [
-        "54f8d9526933b7415a185f073c5279ec28fd01e0",
+        "4a6a23b0fc39d5d1915ebb3345322067403acc75",
         [
          null,
          {
@@ -578618,7 +578738,7 @@
         ]
        ],
        "2d.drawImage.nowrap.html": [
-        "6ec22c45d616d46d28ecd1272a4970c8460684ec",
+        "a45fa15daedbaa7cf2d1a91807087e0a9ab5cdac",
         [
          null,
          {
@@ -578642,7 +578762,7 @@
         ]
        ],
        "2d.drawImage.null.html": [
-        "c32d836ce4762ec83810c0b6f6c1283210dcc924",
+        "76c86b1b4afd409ebf9628f991004a6c86bf3f34",
         [
          null,
          {}
@@ -578656,7 +578776,7 @@
         ]
        ],
        "2d.drawImage.path.html": [
-        "b6bad65df59f5c4e6ad15abaddc303a03dd8ef2e",
+        "938c014c7ab2751625a59c8829fa23a6376cb488",
         [
          null,
          {
@@ -578680,7 +578800,7 @@
         ]
        ],
        "2d.drawImage.self.1.html": [
-        "38857453a442d8b3eb6be0d508db233bb5d79f0c",
+        "9e1777974c59fde16c536fd95dbf4f93f8afac56",
         [
          null,
          {}
@@ -578694,7 +578814,7 @@
         ]
        ],
        "2d.drawImage.self.2.html": [
-        "74d383f7e38b2d4acdc453be20d6c6a5201e918f",
+        "f522d4822d3000e4f00464b6313ab97151a1ffcf",
         [
          null,
          {}
@@ -578708,7 +578828,7 @@
         ]
        ],
        "2d.drawImage.svg.html": [
-        "d275bf95675846e2c1cd5ad9e37f734d0a8ff7db",
+        "559eb9420e624d81e9e923e08729b9a8b9bec53c",
         [
          null,
          {
@@ -578732,7 +578852,7 @@
         ]
        ],
        "2d.drawImage.transform.html": [
-        "741c5efb9fac3adac2989e3df2d3e968b581cfc3",
+        "e4d905474a4a142400d5b17d5a1abc0bbfc23158",
         [
          null,
          {
@@ -578756,7 +578876,7 @@
         ]
        ],
        "2d.drawImage.wrongtype.html": [
-        "84cfaef1a733f2af2bae5a625c91d0060614e73a",
+        "5ea4234aa1850e4e7d73324adb4be59dc70b9edc",
         [
          null,
          {}
@@ -578770,7 +578890,7 @@
         ]
        ],
        "2d.drawImage.zerocanvas.html": [
-        "9d59ba70bc1f55ad4d9ba4b67a64697435627508",
+        "5cb758c2b9bc4683a9dd7a13ce89c71569a242f0",
         [
          null,
          {
@@ -578794,7 +578914,7 @@
         ]
        ],
        "2d.drawImage.zerosource.html": [
-        "cc610399dbbbccdb4e7451a1ffbc89aaa5349824",
+        "d91a196060893d39d57889e3a880e6370deae645",
         [
          null,
          {
@@ -578803,7 +578923,7 @@
         ]
        ],
        "2d.drawImage.zerosource.image.html": [
-        "d79f821d44022aabd740c66474aef75d9400821f",
+        "25cd54b57a0f25a41fcc9858eb95c6590456beec",
         [
          null,
          {
@@ -578844,7 +578964,7 @@
       },
       "drawing-rectangles-to-the-canvas": {
        "2d.clearRect.basic.html": [
-        "846b264ee8c5e73915c1d9413526f626cbd3d002",
+        "6975dda5bcb052bab51bcf42550d688ee6d4f25d",
         [
          null,
          {}
@@ -578858,7 +578978,7 @@
         ]
        ],
        "2d.clearRect.clip.html": [
-        "eb3de8b591f1402f720e51b713eb809587eeac83",
+        "4d67a5fadc6d9ccaafe9ee94c75e2fe2a19b27c9",
         [
          null,
          {}
@@ -578872,7 +578992,7 @@
         ]
        ],
        "2d.clearRect.globalalpha.html": [
-        "c1a3463d313c5af0e4bd5740c892c8efd5004923",
+        "f5c0e52c02e1d2f0a7120e67b3b2be69c28c2720",
         [
          null,
          {}
@@ -578886,7 +579006,7 @@
         ]
        ],
        "2d.clearRect.globalcomposite.html": [
-        "a77f67a4ba4cdcab57cee617d349c43b3b3d28e6",
+        "f46245a6fd2c06a9daf9379453cbd00de3910547",
         [
          null,
          {}
@@ -578900,7 +579020,7 @@
         ]
        ],
        "2d.clearRect.negative.html": [
-        "158294ab3eacb9604d5b39a917a7d24939f8480a",
+        "ff96d1f0782a487180499340ff858f729d001076",
         [
          null,
          {}
@@ -578914,7 +579034,7 @@
         ]
        ],
        "2d.clearRect.nonfinite.html": [
-        "4d3037b26ba19bc1d0a7700e0a43a7dccec15f22",
+        "24aa769bdd73113853b1dd58f359b94b32991eec",
         [
          null,
          {}
@@ -578928,7 +579048,7 @@
         ]
        ],
        "2d.clearRect.path.html": [
-        "ab813b1e9b8364e6b09f49ffc0012deb1d48e959",
+        "e9716c9e59420f2ddf65e3d65689716b7ff2bfa8",
         [
          null,
          {}
@@ -578942,7 +579062,7 @@
         ]
        ],
        "2d.clearRect.shadow.html": [
-        "050591d620312ae22d6cceff50e6ca8f5975a42f",
+        "904dfe9cd9db0bd900557773edaf09ee810f82f2",
         [
          null,
          {}
@@ -578956,7 +579076,7 @@
         ]
        ],
        "2d.clearRect.transform.html": [
-        "cca3c4d32bd78cbe594635999a6d8810c20e5b23",
+        "a2ce63be0d71d9a8ce26cdee3c83b0d7a8643184",
         [
          null,
          {}
@@ -578970,7 +579090,7 @@
         ]
        ],
        "2d.clearRect.zero.html": [
-        "69bbb5ecc7ba417adb02f3e519c6d747e53fd3ba",
+        "aaebbede940268c5d28439147a04b08f34c260cd",
         [
          null,
          {}
@@ -578984,7 +579104,7 @@
         ]
        ],
        "2d.fillRect.basic.html": [
-        "bad032bb7c718ed91af0c43928986eb38612d539",
+        "6d8e6c62f74d7dfa8f1bf14b0cf9bacf3cbf39c4",
         [
          null,
          {}
@@ -578998,7 +579118,7 @@
         ]
        ],
        "2d.fillRect.clip.html": [
-        "7043c2355bcc8090d4bd375b326910a7ba4e18de",
+        "5f38614713a030627d0e94f139c504e896f10ca3",
         [
          null,
          {}
@@ -579012,7 +579132,7 @@
         ]
        ],
        "2d.fillRect.negative.html": [
-        "880e5700bd3db126d01cd71da75273e0bfbb4c22",
+        "7e59325ff3766fded513506ddac727b4075fd066",
         [
          null,
          {}
@@ -579026,7 +579146,7 @@
         ]
        ],
        "2d.fillRect.nonfinite.html": [
-        "0d545e9f3fa4f864685e10d1dfe8e5b0c43f7c1c",
+        "e5b5be1344f41cfc5ff3ea34f998da68dfd804bf",
         [
          null,
          {}
@@ -579040,7 +579160,7 @@
         ]
        ],
        "2d.fillRect.path.html": [
-        "13974b7e2ab8f8ef456e65309eab0d0f787800b3",
+        "2f83eec20516ef4bd015ff47e4eb6fad6c7552fe",
         [
          null,
          {}
@@ -579054,7 +579174,7 @@
         ]
        ],
        "2d.fillRect.shadow.html": [
-        "f3b015f25a79f5872bd09e2919ab6cfe10eff657",
+        "f4dd0b2194be56c419fe4b2a385004077550d262",
         [
          null,
          {}
@@ -579068,7 +579188,7 @@
         ]
        ],
        "2d.fillRect.transform.html": [
-        "081ac763bdf70e936aa10ed194817368dd6fb3e5",
+        "900a5a720c4456252123ca681544924e7bfb10d9",
         [
          null,
          {}
@@ -579082,7 +579202,7 @@
         ]
        ],
        "2d.fillRect.zero.html": [
-        "3f015475d5393f4903a1eac7613ad9227b2bd580",
+        "509b9b6eb494e222e107d950987dd96e093bccae",
         [
          null,
          {}
@@ -579096,7 +579216,7 @@
         ]
        ],
        "2d.strokeRect.basic.html": [
-        "caee5d67354d8685cb1a2b04d3431c47d03b89c2",
+        "581c3884206b79f701bd32fa51718f3f43b6162f",
         [
          null,
          {}
@@ -579110,7 +579230,7 @@
         ]
        ],
        "2d.strokeRect.clip.html": [
-        "3aa5d0392ebd9022bc7566d4dad5f0e6c81025cd",
+        "646be33af1b96a5717de5f1ba4226e5f0b4dc272",
         [
          null,
          {}
@@ -579124,7 +579244,7 @@
         ]
        ],
        "2d.strokeRect.globalalpha.html": [
-        "a470939455b904e4690f08a5191b9dbf1df568fc",
+        "a3e6af9b5cb3d41b47679348cca9245831426301",
         [
          null,
          {}
@@ -579138,7 +579258,7 @@
         ]
        ],
        "2d.strokeRect.globalcomposite.html": [
-        "bfca74c48af751a95b48e8fafeef35e4aaaa67b5",
+        "fb4b4a199e09fdd85eadb9d77609298d7bc0be03",
         [
          null,
          {}
@@ -579152,7 +579272,7 @@
         ]
        ],
        "2d.strokeRect.negative.html": [
-        "04f33b184cd500be80a9011def7b584bc4829434",
+        "3d34371f8a714561b97bf01030fbf118afc7bdec",
         [
          null,
          {}
@@ -579166,7 +579286,7 @@
         ]
        ],
        "2d.strokeRect.nonfinite.html": [
-        "1688912ab8903e8ebb434536c731a4c8f88f9c32",
+        "808522830acf3f7e7f3849e206073947fcae3d88",
         [
          null,
          {}
@@ -579180,7 +579300,7 @@
         ]
        ],
        "2d.strokeRect.path.html": [
-        "c3d80bf299e8304001d5c9d8ea98c7c311c3f393",
+        "b7a99256572a038e8cfd6ae552067a187fe495b2",
         [
          null,
          {}
@@ -579194,7 +579314,7 @@
         ]
        ],
        "2d.strokeRect.shadow.html": [
-        "e80d7511d435f73db1f51572ce7a601d37099fb2",
+        "769a6b19318bdae8e0856a8ff3248422ba25a76d",
         [
          null,
          {}
@@ -579208,7 +579328,7 @@
         ]
        ],
        "2d.strokeRect.transform.html": [
-        "2b44d0c627262023808a4ffd2dbd4612362f5c93",
+        "08148a5cb27bba2aa14a02e8fe3849817e4846db",
         [
          null,
          {}
@@ -579222,7 +579342,7 @@
         ]
        ],
        "2d.strokeRect.zero.1.html": [
-        "fe4d77baaa988c201c34d7f91172c3772301d06e",
+        "52d0964ab38982272063742e399c91eaab12344b",
         [
          null,
          {}
@@ -579236,7 +579356,7 @@
         ]
        ],
        "2d.strokeRect.zero.2.html": [
-        "0e234f85e58d3c33028d03495a6101c77b7e60aa",
+        "42b50187daf0fbb1d02b92050ccf985f646f3bd1",
         [
          null,
          {}
@@ -579250,7 +579370,7 @@
         ]
        ],
        "2d.strokeRect.zero.3.html": [
-        "0145b2e412c298ff157bb828af290d47baf93458",
+        "b5e6bddb6fd5358c0b37e4aa03bfa92586cc099d",
         [
          null,
          {}
@@ -579264,7 +579384,7 @@
         ]
        ],
        "2d.strokeRect.zero.4.html": [
-        "d0c284f8e0936f82048591113e5e4ea524b5a499",
+        "a07d9370378d52438d491cba53c04e5c350e38a0",
         [
          null,
          {}
@@ -579278,7 +579398,7 @@
         ]
        ],
        "2d.strokeRect.zero.5.html": [
-        "2441354c90766b433f1d11695cdd1089b8cb0118",
+        "363c27d680d4f0ce84e23f62cadaede1e7ae99e4",
         [
          null,
          {}
@@ -582313,7 +582433,7 @@
       },
       "filters": {
        "2d.filter.canvasFilterObject.blur.exceptions.tentative.html": [
-        "bc476476e478c7e7e3654628f388fc284be4ac74",
+        "6ce6fb633f8c08e0b168a810350d862b14838b8f",
         [
          null,
          {}
@@ -582327,7 +582447,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.colorMatrix.tentative.html": [
-        "ece8a52216ee4f397c4dd0be87b710cb1b794f3e",
+        "3eda41776c0ef289c23991bc9e88219a974829fd",
         [
          null,
          {}
@@ -582341,7 +582461,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html": [
-        "eaaa12f0a79fdfe59eb9931fc96d527b9f917e30",
+        "7cb8b0dd143602bb2fb6893b63b6bebaf23a3bf0",
         [
          null,
          {}
@@ -582355,7 +582475,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html": [
-        "6c5b04ab8a79694c5b3afcdc548fbee40b409372",
+        "388fdca6f9d8db49680b506c918a163935d25908",
         [
          null,
          {}
@@ -582369,7 +582489,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html": [
-        "a6a7a3615a88b2cfd2f7002471050237cb7eae7d",
+        "44eb7184956bd4b535d8c097237a90e358d8e1b2",
         [
          null,
          {}
@@ -582383,7 +582503,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html": [
-        "f2218b7a1d5afb1d33ff817ce9bee9b43b7a6b6a",
+        "d24a9e8608d1b2c2d404579b9e122522c7965e2e",
         [
          null,
          {}
@@ -582397,7 +582517,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.componentTransfer.table.tentative.html": [
-        "9c4c16db8517c9039d46a13ee552380ef6968465",
+        "a704557cc54551a70dc8087130ae270ba79ad558",
         [
          null,
          {}
@@ -582411,7 +582531,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html": [
-        "b44b074af1b40c386c53345c9d0ead2e2f959fce",
+        "e5efa9cafc55ca538cfb061bc9b3173bd9f03fd1",
         [
          null,
          {}
@@ -582425,7 +582545,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.tentative.html": [
-        "e4e06f27d24a8f4e8657499d50ea3a33a2a2c2c0",
+        "75d369cad2f9e0c3a7674537badd49fdfa79c74e",
         [
          null,
          {}
@@ -582439,7 +582559,7 @@
         ]
        ],
        "2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html": [
-        "d5123476b5ebf54ddb343a0da8face7e350f1cfc",
+        "7882e95a694cccca74e305e6d21d247b5046d1cb",
         [
          null,
          {}
@@ -582453,7 +582573,7 @@
         ]
        ],
        "2d.filter.value.html": [
-        "8f06eb42fa0b168984042bcb9d1f540f23495aeb",
+        "2267c9aa811f00f9232edd568431fd2e8ccce426",
         [
          null,
          {}
@@ -582469,7 +582589,7 @@
       },
       "line-styles": {
        "2d.line.cap.butt.html": [
-        "717317de706f27c2603ac856b0852b9bfd6513eb",
+        "d5eb4cafb6bba16875135d99cd5848252656c64f",
         [
          null,
          {}
@@ -582483,7 +582603,7 @@
         ]
        ],
        "2d.line.cap.closed.html": [
-        "b6479be77e10886954076487816b48085fdcd1d9",
+        "b26054fc162164b0075ef3d2af8161178bf20e80",
         [
          null,
          {}
@@ -582497,7 +582617,7 @@
         ]
        ],
        "2d.line.cap.invalid.html": [
-        "b4598fdd85ee385b287c8dfd1a1f4c66bcd75a06",
+        "0570540ee393a5824ba0463e3184979b7f6c5515",
         [
          null,
          {}
@@ -582511,7 +582631,7 @@
         ]
        ],
        "2d.line.cap.open.html": [
-        "211ff760f662a71385862f4c69fb687ed091676a",
+        "54f904b43295ee6b1fc2d8735caad036492fa1dc",
         [
          null,
          {}
@@ -582525,7 +582645,7 @@
         ]
        ],
        "2d.line.cap.round.html": [
-        "37a27b17bcd57cf1c9d4efc888fda5d454fb12de",
+        "788675310e690e8ff4e7408d53246825d4380f0b",
         [
          null,
          {}
@@ -582539,7 +582659,7 @@
         ]
        ],
        "2d.line.cap.square.html": [
-        "75f9e44e21ab7633e7704f3993f6b29fbc1a75bd",
+        "9d4a03ecad2fa6deee9e0f3a99576326f13dc0f4",
         [
          null,
          {}
@@ -582553,7 +582673,7 @@
         ]
        ],
        "2d.line.cap.valid.html": [
-        "d4fcdfc0b5ef1deffefc6b8781035b73d2bd5228",
+        "996afb37a575b581a0e94d22838e6714ce47851a",
         [
          null,
          {}
@@ -582567,7 +582687,7 @@
         ]
        ],
        "2d.line.cross.html": [
-        "51fd1c407846a99496c6a6c52e29a3c8889642f2",
+        "7c5821f2f56eaf769fc8caa0722ebeaf344b6d0e",
         [
          null,
          {}
@@ -582581,7 +582701,7 @@
         ]
        ],
        "2d.line.defaults.html": [
-        "64c21c563e05ea60025a4494761496e6fe2d761f",
+        "e8a39c082379c7932d9c209da8616d4ee0519c36",
         [
          null,
          {}
@@ -582595,7 +582715,7 @@
         ]
        ],
        "2d.line.invalid.strokestyle.html": [
-        "c1bb974dbf79d11f2edb822c44eca65e7f3e0e17",
+        "2554d714d92a584ef78b43385b1292db31d1c891",
         [
          null,
          {}
@@ -582609,7 +582729,7 @@
         ]
        ],
        "2d.line.join.bevel.html": [
-        "ecf83e7b5a0daf54fcb9d7f57c0f3860fb226de7",
+        "b2325ad9891453f0abe0d4e71726959fca26c802",
         [
          null,
          {}
@@ -582623,7 +582743,7 @@
         ]
        ],
        "2d.line.join.closed.html": [
-        "7ce6599f4c100281033f251b7b7b6d0e90ab5da7",
+        "a999e73d0a851c60c9e4e7b0f51d6bd549b13658",
         [
          null,
          {}
@@ -582637,7 +582757,7 @@
         ]
        ],
        "2d.line.join.invalid.html": [
-        "59d8b4311d8e0a9f03021d383d181c3145eda7a1",
+        "f941c69e3dcb9837757c439b885cf619b0874270",
         [
          null,
          {}
@@ -582651,7 +582771,7 @@
         ]
        ],
        "2d.line.join.miter.html": [
-        "d28fb8b69f384b18d9a7242efd0d06d2feab4974",
+        "e31ef139fb155176cec2d318386388fc7b0d8613",
         [
          null,
          {}
@@ -582665,7 +582785,7 @@
         ]
        ],
        "2d.line.join.open.html": [
-        "5bd8e48061c30df3a46d4f0d470963442e3f5a82",
+        "b6a3901a9e403242092065de7a4c1af1e57a7e2b",
         [
          null,
          {}
@@ -582679,7 +582799,7 @@
         ]
        ],
        "2d.line.join.parallel.html": [
-        "928bb86f120693444f24ab7c7852e3e34994f88f",
+        "aaba8e44328fcd27998433f7dfae34039c361b62",
         [
          null,
          {}
@@ -582693,7 +582813,7 @@
         ]
        ],
        "2d.line.join.round.html": [
-        "9441585e50d4b22373a5859ee2487fb8f285c223",
+        "5f413373cb55bc5574e686a6a4ecf33558c7a790",
         [
          null,
          {}
@@ -582707,7 +582827,7 @@
         ]
        ],
        "2d.line.join.valid.html": [
-        "b3b15fc09d68111536cb93825efe6cec90314b93",
+        "1ea992c70634f94af4ae983aa77ce920bec0cc49",
         [
          null,
          {}
@@ -582721,7 +582841,7 @@
         ]
        ],
        "2d.line.miter.acute.html": [
-        "1713d8174ea27ed99aaeec806332ab439b03f1dc",
+        "db8e4f84264e2ffbca941996ed51439951eeb8d4",
         [
          null,
          {}
@@ -582735,7 +582855,7 @@
         ]
        ],
        "2d.line.miter.exceeded.html": [
-        "172c63ca1cedee595df9c12031cd87134c0fcc6b",
+        "828af67835c8d112c9a29a83515bfcd710944a6d",
         [
          null,
          {}
@@ -582749,7 +582869,7 @@
         ]
        ],
        "2d.line.miter.invalid.html": [
-        "27251d4902aff9b6aa1448c276dec82be88bfd42",
+        "42d5d927d76720d4a3d509b2355c9927c746948b",
         [
          null,
          {}
@@ -582763,7 +582883,7 @@
         ]
        ],
        "2d.line.miter.lineedge.html": [
-        "5ede60b8995dbb7345dd182783836700b3ef9b87",
+        "89f4c03255486fb4737ac326d71425a5bdf38a5c",
         [
          null,
          {}
@@ -582777,7 +582897,7 @@
         ]
        ],
        "2d.line.miter.obtuse.html": [
-        "0eaeedfa4197622d387b316ec27a1bb76e4833a4",
+        "69acc7e7bad318d08ea59fccfa58a79e17b1d552",
         [
          null,
          {}
@@ -582791,7 +582911,7 @@
         ]
        ],
        "2d.line.miter.rightangle.html": [
-        "7f8134f180fe52abdaa4bb44286f47a60cfa92d0",
+        "980f8a74b8bd79bb901ad1e33c1eaa016648ad27",
         [
          null,
          {}
@@ -582805,7 +582925,7 @@
         ]
        ],
        "2d.line.miter.valid.html": [
-        "2702fc57a3c18ce503590431a0dd73ae506872c4",
+        "1cf07cfbb3ce480f3abc65a064bea1833a16d766",
         [
          null,
          {}
@@ -582819,7 +582939,7 @@
         ]
        ],
        "2d.line.miter.within.html": [
-        "a9f7a366a38a687d54ea14d06f235e4dfe791045",
+        "150953cf76631e6589c406cb532f147c01537dfc",
         [
          null,
          {}
@@ -582833,7 +582953,7 @@
         ]
        ],
        "2d.line.union.html": [
-        "1f8b3a0d67c7f2b43edeb43c7a880e504b3a8665",
+        "69e42b7a8d3ef52efcd7dfb0964296b9c7197c85",
         [
          null,
          {}
@@ -582847,7 +582967,7 @@
         ]
        ],
        "2d.line.width.basic.html": [
-        "1d0e0298288891a002c3322701f4325da44f846d",
+        "9b087ce8d34d479720aba1c19a7597564107102e",
         [
          null,
          {}
@@ -582861,7 +582981,7 @@
         ]
        ],
        "2d.line.width.invalid.html": [
-        "993dc17948f42c334d0a3122e3722fafdb595891",
+        "0651b3f6a5e6241cdc5aee6088e519192b5df204",
         [
          null,
          {}
@@ -582875,7 +582995,7 @@
         ]
        ],
        "2d.line.width.scaledefault.html": [
-        "091fd80c298a2cd0c29e84b9f408b2048dc56a52",
+        "120360607f9ad8e96732a044c648eacef02673b4",
         [
          null,
          {}
@@ -582889,7 +583009,7 @@
         ]
        ],
        "2d.line.width.transformed.html": [
-        "c54943e462cc70b0e04ab33a7b8cc1e610e3ae36",
+        "d2358ba2e84ad49dd0fd0bc11d9e1dc8812aaeec",
         [
          null,
          {}
@@ -582903,7 +583023,7 @@
         ]
        ],
        "2d.line.width.valid.html": [
-        "bdd86c6fbbf5cd69f5f1dfd5678f39cfa0f983ea",
+        "4a4563c4e355eace604665156073952f22f639f9",
         [
          null,
          {}
@@ -585702,7 +585822,7 @@
       },
       "pixel-manipulation": {
        "2d.imageData.create1.basic.html": [
-        "24d9a77405353843e757001b0b7127321597d258",
+        "1f21ce6e32bbf8aea4202e5ceb5176cdcfa06055",
         [
          null,
          {}
@@ -585716,7 +585836,7 @@
         ]
        ],
        "2d.imageData.create1.initial.html": [
-        "658ae83b5607ab21cf8b0a4ed90364e2c5713521",
+        "6e9e02c77d0e1db8b303fedf980ed10f7dfb9722",
         [
          null,
          {}
@@ -585730,7 +585850,7 @@
         ]
        ],
        "2d.imageData.create1.zero.html": [
-        "736725f0fd98f12430f0ef4a9f84891d6947cf00",
+        "a4d074043f30415b91998f568dbb05d0322e818e",
         [
          null,
          {}
@@ -585744,7 +585864,7 @@
         ]
        ],
        "2d.imageData.create2.basic.html": [
-        "7dca77e4ae91b4f2c9d53beba4c74468c0f39d9c",
+        "4e99cac955fa01ce0c1e54b6f7b8236fea60775d",
         [
          null,
          {}
@@ -585757,8 +585877,22 @@
          {}
         ]
        ],
+       "2d.imageData.create2.double.html": [
+        "d927f28854d795f6a30fa2ccd5280c52438e4899",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.create2.double.worker.js": [
+        "773204cd418b7c67f57249d730ce74af92962434",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.html",
+         {}
+        ]
+       ],
        "2d.imageData.create2.initial.html": [
-        "76017f5c4f909848cf175889effc7b3c2229f41f",
+        "10029344246c77922e53902b3fbdbc31aaf9c902",
         [
          null,
          {}
@@ -585772,7 +585906,7 @@
         ]
        ],
        "2d.imageData.create2.large.html": [
-        "f3d19d3f29127a44d026e7c2edc96591d743fe6c",
+        "e18893e9086bf12cc85c00eaa617fe9a06c50a95",
         [
          null,
          {}
@@ -585786,7 +585920,7 @@
         ]
        ],
        "2d.imageData.create2.negative.html": [
-        "f4b4df99a8a700eb034daf1502116a06e595cccd",
+        "9272c9ed9c1640470f436a0b0fe9e54c5d71e6b8",
         [
          null,
          {}
@@ -585800,21 +585934,21 @@
         ]
        ],
        "2d.imageData.create2.nonfinite.html": [
-        "d7d1e7f7563abc903e2dcebdf489f064fcb71df8",
+        "f51dd744210ea9dddd5eb29b1d0d5a3d412ecdae",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.create2.nonfinite.worker.js": [
-        "f398e2a5d4f97573cd9047f3c076fc056b4c4cd1",
+        "ace0f64f94e21fcd8b84f77143e90f3d4a5f4675",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.html",
          {}
         ]
        ],
        "2d.imageData.create2.round.html": [
-        "f2f0aa89e25b18d380fdd5505b6a3d80ab06e298",
+        "046a04dbcca94a9e7d58bd7d2988032ddd024861",
         [
          null,
          {}
@@ -585828,21 +585962,21 @@
         ]
        ],
        "2d.imageData.create2.zero.html": [
-        "7c3a2d9410658b4b6da195209707bd29d0b03349",
+        "f109c7dc03fea25a69708a6c5ea688f11e81f911",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.create2.zero.worker.js": [
-        "615a989e68d8724d91d4e303d2110f8282546f64",
+        "061e4ca13664f7c2e6807dc4d656008d3651dcd2",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.html",
          {}
         ]
        ],
        "2d.imageData.get.basic.html": [
-        "d4f4a63b3a5a34cf05067fb9ab7db1dc971fb940",
+        "e9cc7e980182c535bff93ee7122dbc562aef3227",
         [
          null,
          {}
@@ -585856,7 +585990,7 @@
         ]
        ],
        "2d.imageData.get.clamp.html": [
-        "9cbc1b48dc36ae183c972fe6de2b79ecfc7c2119",
+        "f832c51c5504d569b6d5c744e7332cb63524ba19",
         [
          null,
          {}
@@ -585869,8 +586003,50 @@
          {}
         ]
        ],
+       "2d.imageData.get.double.html": [
+        "6839632de7072477fc6d732e1449d0ed05dd12af",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.get.double.worker.js": [
+        "e05fe1009cb8f4bd4868ae872bbc5fc263f34b37",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.html",
+         {}
+        ]
+       ],
+       "2d.imageData.get.invalid.html": [
+        "df63bd2e2a53c09609f5a036bb66d1495d820070",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.get.invalid.worker.js": [
+        "c9798f59f63662d7924df13489fc73b495c70f0c",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.html",
+         {}
+        ]
+       ],
+       "2d.imageData.get.large.crash.html": [
+        "5e6102d67d012f529a5d103e0916a2a44096e67f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.get.large.crash.worker.js": [
+        "142c0b833d003dcb0e9d112974929aeac9377bf0",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.html",
+         {}
+        ]
+       ],
        "2d.imageData.get.length.html": [
-        "2f7247fafcd6bad2e08682e7f171563c72f68264",
+        "19fbac065356f18040cc38a1df058a45b52ece96",
         [
          null,
          {}
@@ -585884,21 +586060,21 @@
         ]
        ],
        "2d.imageData.get.nonfinite.html": [
-        "5efc73663da596314ba290d5f49338fa6a3e15d1",
+        "b9324865b6b43cd3b33f932189d4fd62a57a7af8",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.get.nonfinite.worker.js": [
-        "15b3950adc49cbeaa5e32588ef95cd2692f9a211",
+        "da70d1b21382f39528a02a092c9f635f5f4f7b61",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.html",
          {}
         ]
        ],
        "2d.imageData.get.nonpremul.html": [
-        "bed3294be4685c17f6412f3d35c57415c7edb2c6",
+        "89eea879318965101e69881dce49e033df21985c",
         [
          null,
          {}
@@ -585912,7 +586088,7 @@
         ]
        ],
        "2d.imageData.get.order.alpha.html": [
-        "a169cb59e3048c63812d0bb61d732c4efb83a83d",
+        "f79f5f351e010ee4b94b6dc8c5d2239cab7fd723",
         [
          null,
          {}
@@ -585926,7 +586102,7 @@
         ]
        ],
        "2d.imageData.get.order.cols.html": [
-        "09eb58a7fdf2825d0f277929d2d951863a3b6a67",
+        "9afceba7023a1eccd5cca36d398191d789ee237b",
         [
          null,
          {}
@@ -585940,7 +586116,7 @@
         ]
        ],
        "2d.imageData.get.order.rgb.html": [
-        "b56adf19fe09cd3aaf89217eb6749a669e4e3b6c",
+        "0fd4759409e162ac5e30499b677fcae1d4c3d9e8",
         [
          null,
          {}
@@ -585954,7 +586130,7 @@
         ]
        ],
        "2d.imageData.get.order.rows.html": [
-        "3ad1ced7d229499fc89f6ca3c00067bf45b6d682",
+        "eb7a137ab19cc85067d37589bea60b8d45812094",
         [
          null,
          {}
@@ -585968,7 +586144,7 @@
         ]
        ],
        "2d.imageData.get.range.html": [
-        "283dd07b4cb2f64b87dc2a17ad07dcf927693eae",
+        "91c0c5844a5cd453b629f1923d53614b1a69912c",
         [
          null,
          {}
@@ -585981,36 +586157,50 @@
          {}
         ]
        ],
+       "2d.imageData.get.rounding.html": [
+        "a06d180a57553087b3c20f72daddd04c43c201fb",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.imageData.get.rounding.worker.js": [
+        "8cdbf790f9da881d9f513dbfa178683a93bb38f4",
+        [
+         "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.html",
+         {}
+        ]
+       ],
        "2d.imageData.get.source.negative.html": [
-        "a7e3d8574f94ca240ff1ce2c51eeade5d3295c38",
+        "7e9d36338d776f4933e0c0e8998450eba3b9f885",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.get.source.negative.worker.js": [
-        "e057315d57cbcbc67c02aba42ff22f19318a7112",
+        "989178792a098d7b09c81e3eb573078ba37978c7",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.html",
          {}
         ]
        ],
        "2d.imageData.get.source.outside.html": [
-        "a071e44d55766bd2ecbb0882e741fdd22145f677",
+        "7dbe2dd1b34ebfd998b0f07b6e7035e501be324c",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.get.source.outside.worker.js": [
-        "4025ecd4be9f49a31ba1e91fd403d5ded048be13",
+        "eb7f355d6832b94b97f870e7224273da24ecbdcb",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.html",
          {}
         ]
        ],
        "2d.imageData.get.source.size.html": [
-        "4fd551db7dbf0e020785500ccfbb4b1937dc5bcd",
+        "8a8a71d98845f837182aa8c26e8b4a4e2feaad1e",
         [
          null,
          {}
@@ -586024,7 +586214,7 @@
         ]
        ],
        "2d.imageData.get.unaffected.html": [
-        "f65f015e8f87e23784bd173935f2126d03a70f15",
+        "c096cc5be31d513775e8f145598227fc8de296fc",
         [
          null,
          {}
@@ -586038,35 +586228,35 @@
         ]
        ],
        "2d.imageData.get.zero.html": [
-        "91cf5a25e2b7bf7a6a075ea2dd9edb89aead4743",
+        "9bad2b784394e293c9e1525aadf2e8c23b2109c2",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.get.zero.worker.js": [
-        "07e8f3621b739e520ea66d46289cb761462678fb",
+        "82f021ca8d4a28c0550380c251fd386a2f51a525",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.html",
          {}
         ]
        ],
        "2d.imageData.object.clamp.html": [
-        "8b1515c678bfc08eaac27f7ff23691fc24fcd67a",
+        "1bd6224892ce69f73362af234a3fe052642f7524",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.object.clamp.worker.js": [
-        "0e2a33c75ef3244c653d6e0d61ce54df5bcf50c5",
+        "0914c8fdc7548a704c862f51e8cdb3432ddbec9b",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.html",
          {}
         ]
        ],
        "2d.imageData.object.nan.html": [
-        "9fce409778d5151ef4e05403a3f5e088f77f1ced",
+        "9910af8e2af927cc37f3c9e9753589a4b43a6154",
         [
          null,
          {}
@@ -586080,7 +586270,7 @@
         ]
        ],
        "2d.imageData.object.properties.html": [
-        "05a4106b6ba622e542eaba6574ce3f9f97d72641",
+        "13dd36953289b83d10e3cefbcdeb6ba5170a77c9",
         [
          null,
          {}
@@ -586094,7 +586284,7 @@
         ]
        ],
        "2d.imageData.object.readonly.html": [
-        "5fbdfc5ce08917e29960127a6c1dc3a25ff64d2b",
+        "a141786fec8fb28bce04ae91d3b2c3a155d2fe62",
         [
          null,
          {}
@@ -586108,7 +586298,7 @@
         ]
        ],
        "2d.imageData.object.round.html": [
-        "8b362a01c6721a0a9ef893247fda0ac5ad50b693",
+        "306ccb8df448231c7ec4d6de2010a27dfa228ee5",
         [
          null,
          {}
@@ -586122,7 +586312,7 @@
         ]
        ],
        "2d.imageData.object.set.html": [
-        "95305c5bc4527a12d3eb1b5e983957f151a9090b",
+        "a5808b7777223ff6ed31909cc34d00e267bb3b1e",
         [
          null,
          {}
@@ -586136,7 +586326,7 @@
         ]
        ],
        "2d.imageData.object.string.html": [
-        "a7b5d578d2b259ca4fa21f7c80bd651969b1df90",
+        "5245f3a6757d8988e56bc5b88679f01edd425984",
         [
          null,
          {}
@@ -586150,7 +586340,7 @@
         ]
        ],
        "2d.imageData.object.undefined.html": [
-        "a2533a52e6d7f036591d5aae97f701f1f54fc82b",
+        "3290c579bb38c7ea5a994f3923551810bd07c91a",
         [
          null,
          {}
@@ -586164,7 +586354,7 @@
         ]
        ],
        "2d.imageData.put.alpha.html": [
-        "ecda85bd121550d4cb6c3ce6305490cfa9554c6e",
+        "4e64e4207e2376b46a183a6d55b1543ce6213a3b",
         [
          null,
          {}
@@ -586178,7 +586368,7 @@
         ]
        ],
        "2d.imageData.put.basic.html": [
-        "d140cc39ab4315a834b7e54d4e30cc53be5d8903",
+        "76f143ad6aee54ec40c8899b234789caaa6be1d4",
         [
          null,
          {}
@@ -586192,7 +586382,7 @@
         ]
        ],
        "2d.imageData.put.clip.html": [
-        "121a45fae8a429f5078a3f7155bae4be2786aafd",
+        "fef4c2c1a88f0308f05dd8b8cbec74923ffb3a3e",
         [
          null,
          {}
@@ -586206,7 +586396,7 @@
         ]
        ],
        "2d.imageData.put.created.html": [
-        "7ade3b1debe225deb909739fc6ea06debccfd8fa",
+        "d936c02d418a01e3126eb8d251950651583d4ce7",
         [
          null,
          {}
@@ -586220,7 +586410,7 @@
         ]
        ],
        "2d.imageData.put.cross.html": [
-        "af90d71991e8b0ea292c1214993d0977abdd142c",
+        "e00f9bd0db5520352003409dd6b5794d16fb94c0",
         [
          null,
          {}
@@ -586234,63 +586424,63 @@
         ]
        ],
        "2d.imageData.put.dirty.negative.html": [
-        "e2fbcb270283df8df3641e9597860e03230ec18e",
+        "7493abc0cbb41db460613f5876be89a34729e9f0",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.put.dirty.negative.worker.js": [
-        "5eec264c756e05e6c5f537cb8045eaedf3338a86",
+        "f228813f321415a597746bc220491412c8cbd870",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.html",
          {}
         ]
        ],
        "2d.imageData.put.dirty.outside.html": [
-        "aaf48a762bcf683c0594871e496d2da6f433111e",
+        "3aa731d7fb3d49dbba95d5dfc81e796126327452",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.put.dirty.outside.worker.js": [
-        "9f537135dac2ba30b88ae060fd85d488da04de5c",
+        "d1993a44803b8edf7f3d9ddaf1b03f85921c8d58",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.html",
          {}
         ]
        ],
        "2d.imageData.put.dirty.rect1.html": [
-        "e973eb6ca4b22886f6101543f1e6818f392fff1c",
+        "17a14cfe9e11a4b6d89c7f66296a3ee4442187cc",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.put.dirty.rect1.worker.js": [
-        "fdbe6561ce5484f71d9bc85d34a568e4a3b9ef7c",
+        "d694e2ef435eecb1709e94fc2a3e0880fa8662c8",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.html",
          {}
         ]
        ],
        "2d.imageData.put.dirty.rect2.html": [
-        "9b275429e6e7bb6355a621202674a4bc0e8e1c49",
+        "df1f6fe039257894873732568d17fbe9c4e09ad3",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.put.dirty.rect2.worker.js": [
-        "3578ceec25aa6c69ee897166df829b323d5beebe",
+        "6652b1a93071971ab174210f9330f23e88c5dd44",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.html",
          {}
         ]
        ],
        "2d.imageData.put.dirty.zero.html": [
-        "c1b6735d259cf82c4442541b7b1bb5a36c347422",
+        "2e6462895c43d86820d2824abf5850ed5bedb886",
         [
          null,
          {}
@@ -586304,7 +586494,7 @@
         ]
        ],
        "2d.imageData.put.modified.html": [
-        "543d9ff29304930d2ff9680a540b3d79f8b6b7c9",
+        "04f64600cd6d71f9f788453fb05499dd3e870bc8",
         [
          null,
          {}
@@ -586318,21 +586508,21 @@
         ]
        ],
        "2d.imageData.put.nonfinite.html": [
-        "6590f761adf03337373db5d83a3097c5b429e9dc",
+        "c8f322c2f03b689964b59ee794d2bc8757cadbca",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.put.nonfinite.worker.js": [
-        "04298fa99fac35d26b33053a07f35ef8b3d6d82f",
+        "c63d66f0dc709c1051ea7aaabd97fdba4927b7bd",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.html",
          {}
         ]
        ],
        "2d.imageData.put.null.html": [
-        "3a51c9719cff5e566d47dd486e071f5fe2b603b7",
+        "82eb5c28b66bf7cf48060c08d530757196d3d5a8",
         [
          null,
          {}
@@ -586346,7 +586536,7 @@
         ]
        ],
        "2d.imageData.put.path.html": [
-        "53e3ac4fceed8044e3c1f2bf7027624f8fda323c",
+        "8d63a4287d2ac2b4857b3786708bfee26eac349b",
         [
          null,
          {}
@@ -586360,7 +586550,7 @@
         ]
        ],
        "2d.imageData.put.unaffected.html": [
-        "8d94f9bbf63541c65912bc463c33402f84679858",
+        "048818fdba57561830c972f5606cbf6604a87f21",
         [
          null,
          {}
@@ -586374,21 +586564,21 @@
         ]
        ],
        "2d.imageData.put.unchanged.html": [
-        "b3aff6f49c2bd966671880ce384ba0b9cb86056d",
+        "cab36f19e1e91977f2669ee42e09e4612700394f",
         [
          null,
          {}
         ]
        ],
        "2d.imageData.put.unchanged.worker.js": [
-        "231ba3860da8f5db3cafb2851f795c982ae99d25",
+        "07f4362f43c36db32d2b70480117faebb540394d",
         [
          "html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.html",
          {}
         ]
        ],
        "2d.imageData.put.wrongtype.html": [
-        "8e8ca53a9a4f60242ceb9791f03181a124fe9975",
+        "d726d5f968484fd3e392aca8357bbd4ef1655011",
         [
          null,
          {}
@@ -589347,7 +589537,7 @@
       },
       "wide-gamut-canvas": {
        "2d.color.space.p3.to.p3.html": [
-        "fd8385bbf72bf0f5e6d1fc8edeb7282dfb636203",
+        "d307dbe96d91dec5e1bf99c470bda93cbacde693",
         [
          null,
          {}
@@ -589361,7 +589551,7 @@
         ]
        ],
        "2d.color.space.p3.to.srgb.html": [
-        "56d771b666431fc9885712fc8329a1242fa8cee3",
+        "8427a752b09c343d720f1236bce810471fcd43f1",
         [
          null,
          {}
@@ -593839,13 +594029,6 @@
        ]
       },
       "contenteditable": {
-       "contentEditable-invalidvalue.html": [
-        "b8c17c3a41677fb137919dda1488137a24470016",
-        [
-         null,
-         {}
-        ]
-       ],
        "contentEditable-slotted-inherit.html": [
         "42da515920e6eacf35bc2ac9ffd43765b667a362",
         [
@@ -593854,7 +594037,7 @@
         ]
        ],
        "contenteditable-enumerated-ascii-case-insensitive.html": [
-        "209686680e91472bf064f7b37972c54f47bc8a15",
+        "0125b95667f200770f4c7530464c790c558ae3b8",
         [
          null,
          {}
@@ -593868,7 +594051,7 @@
         ]
        ],
        "user-interaction-editing-contenteditable.html": [
-        "2e51109fa7abe71fb763b9b4beb11aac9b1e8ad9",
+        "19b21863e09ef388eb69f3033c2f0b998c336ccb",
         [
          null,
          {}
@@ -605313,6 +605496,13 @@
          {}
         ]
        ],
+       "dialog-form-submission-unusual.html": [
+        "ae0de29a89e163e7852adcd9095f2613f70448fb",
+        [
+         null,
+         {}
+        ]
+       ],
        "dialog-form-submission.html": [
         "5934485087a267f917d9b47d5414a36c1065da6f",
         [
@@ -605910,7 +606100,7 @@
        ]
       ],
       "popover-focus.html": [
-       "a8555d7647c1d5e16620a8e7259a049360359587",
+       "771efada1add0ab3d3ed078d7b74760af2639e1c",
        [
         null,
         {
@@ -606000,7 +606190,7 @@
        ]
       ],
       "popover-top-layer-interactions.html": [
-       "6ef6938810b8532b78f7fbfc905b8f84c1300df9",
+       "6e707cb45be77d957d2a85b38e6883284307c2fc",
        [
         null,
         {
@@ -620614,6 +620804,15 @@
        }
       ]
      ],
+     "loaf-iframe-popup.html": [
+      "83def5729984f63bcd491152f56c548a54bf0d87",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "loaf-timeline.html": [
       "c434a26ef8d18aa84836dbef56f737df425beb57",
       [
@@ -623568,7 +623767,7 @@
      ]
     ],
     "MediaRecorder-detached-context.html": [
-     "f8a8699ad9fb62291cf68ab30cf88e22b71bfe13",
+     "bd49a720b90e34a2ac90d45cc2b3a09f8d7b12d4",
      [
       null,
       {}
@@ -623584,7 +623783,7 @@
      ]
     ],
     "MediaRecorder-error.html": [
-     "54e83ecac767525e84ce8f1ae38f935c6bac2f7d",
+     "97e781054f33b1eaabb6433ad41f703b0806cc36",
      [
       null,
       {}
@@ -624121,6 +624320,13 @@
       }
      ]
     ],
+    "overconstrained_error.https.html": [
+     "abaff3b773177f38b02c9483f0bd158235b95b09",
+     [
+      null,
+      {}
+     ]
+    ],
     "parallel-capture-requests.https.html": [
      "301515d1bd36ac294299f0a41e92b3abf01f1eb2",
      [
@@ -652653,6 +652859,22 @@
     ]
    },
    "serial": {
+    "getPorts": {
+     "reject_opaque_origin.https.html": [
+      "b2f630a3197deb0e80f01c28dafe3e8fd72971c9",
+      [
+       null,
+       {}
+      ]
+     ],
+     "sandboxed_iframe.https.window.js": [
+      "8fae11ccfe53acc00a6a1cc1afd21439b7d1c968",
+      [
+       "serial/getPorts/sandboxed_iframe.https.window.html",
+       {}
+      ]
+     ]
+    },
     "idlharness.https.any.js": [
      "b240da933ade1595d3b1965c3ca6613c91c8318f",
      [
@@ -652686,6 +652908,22 @@
       }
      ]
     ],
+    "requestPort": {
+     "reject_opaque_origin.https.html": [
+      "ade8ae7392eccd9782f3b12f79ae71396de08913",
+      [
+       null,
+       {}
+      ]
+     ],
+     "sandboxed_iframe.https.window.js": [
+      "6e169510a0bd0ad0123aa2a78c8646c99b8b186f",
+      [
+       "serial/requestPort/sandboxed_iframe.https.window.html",
+       {}
+      ]
+     ]
+    },
     "serial-allowed-by-permissions-policy-attribute-redirect-on-load.https.sub.html": [
      "ac278ff0cf0f92dd2547851771e5cda7cc15ea4b",
      [
@@ -657718,6 +657956,13 @@
       ]
      ]
     },
+    "focus-within-shadow.html": [
+     "e65165a786d6467345390023fd3e014ea0a63246",
+     [
+      null,
+      {}
+     ]
+    ],
     "form-control-form-attribute.html": [
      "2e782b2587d8dc6b71deee7d229ed4e8a996703c",
      [
@@ -661337,7 +661582,7 @@
      ]
     ],
     "requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js": [
-     "41f2f5c74ec7877ee0eb37f705d9fb52085dc573",
+     "5496e89670cfcf6d4c1dfce06507ff249112e7b7",
      [
       "storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.html",
       {
@@ -662736,11 +662981,51 @@
        }
       ]
      ],
-     "enqueue-with-detached-buffer.window.js": [
-      "15400f69340451458bca4dc24277d7887797c349",
+     "enqueue-with-detached-buffer.any.js": [
+      "d2b37f00a9d697243433ddc7f2eb44a3d2e3d7f3",
       [
-       "streams/readable-byte-streams/enqueue-with-detached-buffer.window.html",
-       {}
+       "streams/readable-byte-streams/enqueue-with-detached-buffer.any.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/enqueue-with-detached-buffer.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/enqueue-with-detached-buffer.any.sharedworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ]
+        ]
+       }
+      ],
+      [
+       "streams/readable-byte-streams/enqueue-with-detached-buffer.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ]
+        ]
+       }
       ]
      ],
      "general.any.js": [
@@ -674092,7 +674377,18 @@
        ]
       }
      ]
-    ]
+    ],
+    "role": {
+     "basic.html": [
+      "d371aa72dcba645ad9edb3de6a87ccdafbab68b2",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ]
+    }
    },
    "wasm": {
     "create_multiple_memory.worker.js": [
@@ -690273,7 +690569,7 @@
      ]
     ],
     "RTCRtpTransceiver-headerExtensionControl.html": [
-     "4925850ff03756d435dff9b28fde3118a608660a",
+     "770aa49f052f5d5f84185ca6420c674a6dadb765",
      [
       null,
       {}
@@ -734533,7 +734829,7 @@
       "network": {
        "before_request_sent": {
         "before_request_sent_tentative.py": [
-         "1711f5177fe57fa2225339f5f29d70f4e04e862f",
+         "0afa439c822ee64b4dbe742fec625a26c40091ce",
          [
           null,
           {}
@@ -734551,7 +734847,7 @@
        },
        "response_completed": {
         "response_completed_tentative.py": [
-         "347f970c61d1283f249b46808aa6f32eed7585a9",
+         "b129859e7ed73db63f1af4064c1113c91d94f469",
          [
           null,
           {}
@@ -734560,7 +734856,7 @@
        },
        "response_started": {
         "response_started_tentative.py": [
-         "18c78c6922a3e0b34de7be18e4fb7a5e8c70d82a",
+         "b1a0741f202a95eb3544a22e4e08548fdaef2e7d",
          [
           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 968f62a2553..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini b/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini
index 2fec18ada84..87006cd6488 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini
@@ -521,3 +521,83 @@
   [Web Animations: property <line-height> from [normal\] to [14px\] at (0.5) should be [14px\]]
     expected: FAIL
 
+  [CSS Transitions: property <line-height> from [initial\] to [20px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [initial\] to [20px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [initial\] to [20px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [14px\] at (-0.3) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [14px\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [14px\] at (0.3) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14px\] to [normal\] at (-0.3) should be [14px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14px\] to [normal\] at (0) should be [14px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14px\] to [normal\] at (0.3) should be [14px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [normal\] to [4\] at (-0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [normal\] to [4\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [normal\] to [4\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [normal\] at (-0.3) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [normal\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [normal\] at (0.3) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [normal\] to [14px\] at (-0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [normal\] to [14px\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [normal\] to [14px\] at (0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14px\] to [4\] at (-0.3) should be [14px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14px\] to [4\] at (0) should be [14px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14px\] to [4\] at (0.3) should be [14px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [14q\] at (-0.3) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [14q\] at (0) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [4\] to [14q\] at (0.3) should be [4\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14q\] to [normal\] at (-0.3) should be [14q\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14q\] to [normal\] at (0) should be [14q\]]
+    expected: FAIL
+
+  [CSS Transitions: property <line-height> from [14q\] to [normal\] at (0.3) should be [14q\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 5e3a96e5999..a057f038339 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,5 +8,8 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 4]
+  [[data-expected-height\] 1]
+    expected: FAIL
+
+  [[data-expected-height\] 2]
     expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
new file mode 100644
index 00000000000..3e5096beef3
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-float-002.html.ini
@@ -0,0 +1,3 @@
+[block-in-inline-hittest-float-002.html]
+  [block-in-inline-hittest-float-002]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
index f9e216a8cfc..cdd8b55f192 100644
--- a/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
+++ b/tests/wpt/metadata/css/CSS2/normal-flow/block-in-inline-hittest-relpos-zindex.html.ini
@@ -1,6 +1,3 @@
 [block-in-inline-hittest-relpos-zindex.html]
   [position: relative; z-index: -1;]
     expected: FAIL
-
-  [block-in-inline-hittest-relpos-zindex]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visufx/animation/visibility-interpolation.html.ini b/tests/wpt/metadata/css/CSS2/visufx/animation/visibility-interpolation.html.ini
index 5e91c9bbbff..0309ba9b3e5 100644
--- a/tests/wpt/metadata/css/CSS2/visufx/animation/visibility-interpolation.html.ini
+++ b/tests/wpt/metadata/css/CSS2/visufx/animation/visibility-interpolation.html.ini
@@ -113,3 +113,11 @@
   [Web Animations: property <visibility> from [collapse\] to [hidden\] at (-0.3) should be [collapse\]]
     expected: FAIL
 
+  [CSS Transitions: property <visibility> from [collapse\] to [hidden\] at (-0.3) should be [collapse\]]
+    expected: FAIL
+
+  [CSS Transitions: property <visibility> from [collapse\] to [hidden\] at (0) should be [collapse\]]
+    expected: FAIL
+
+  [CSS Transitions: property <visibility> from [collapse\] to [hidden\] at (0.3) should be [collapse\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-align/animation/column-gap-interpolation.html.ini b/tests/wpt/metadata/css/css-align/animation/column-gap-interpolation.html.ini
index 4870df475f6..55b2ba46f45 100644
--- a/tests/wpt/metadata/css/css-align/animation/column-gap-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-align/animation/column-gap-interpolation.html.ini
@@ -470,3 +470,29 @@
   [CSS Transitions with transition: all: property <column-gap> from [0px\] to [100px\] at (0.3) should be [30px\]]
     expected: FAIL
 
+  [CSS Transitions: property <column-gap> from [initial\] to [20px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [initial\] to [20px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [initial\] to [20px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [unset\] to [20px\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [unset\] to [20px\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [unset\] to [20px\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [normal\] to [20px\] at (-0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [normal\] to [20px\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <column-gap> from [normal\] to [20px\] at (0.3) should be [normal\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-align/animation/row-gap-interpolation.html.ini b/tests/wpt/metadata/css/css-align/animation/row-gap-interpolation.html.ini
index c2c9640864a..79f1e3a90db 100644
--- a/tests/wpt/metadata/css/css-align/animation/row-gap-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-align/animation/row-gap-interpolation.html.ini
@@ -470,3 +470,29 @@
   [CSS Transitions with transition: all: property <row-gap> from [initial\] to [20px\] at (1.5) should be [20px\]]
     expected: FAIL
 
+  [CSS Transitions: property <row-gap> from [initial\] to [20px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [initial\] to [20px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [initial\] to [20px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [unset\] to [20px\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [unset\] to [20px\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [unset\] to [20px\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [normal\] to [20px\] at (-0.3) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [normal\] to [20px\] at (0) should be [normal\]]
+    expected: FAIL
+
+  [CSS Transitions: property <row-gap> from [normal\] to [20px\] at (0.3) should be [normal\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/background-size-interpolation.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/background-size-interpolation.html.ini
index f919c03bef3..56473654544 100644
--- a/tests/wpt/metadata/css/css-backgrounds/animations/background-size-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/background-size-interpolation.html.ini
@@ -689,3 +689,38 @@
   [Web Animations: property <background-size> from [unset\] to [20px 20px, 0px 0px\] at (0.6) should be [20px 20px, 0px 0px\]]
     expected: FAIL
 
+  [CSS Transitions: property <background-size> from [initial\] to [20px 20px, 0px 0px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [initial\] to [20px 20px, 0px 0px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [initial\] to [20px 20px, 0px 0px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [unset\] to [20px 20px, 0px 0px\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [unset\] to [20px 20px, 0px 0px\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [unset\] to [20px 20px, 0px 0px\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [0px 0px, 0px 0px, contain, cover\] to [40px 40px, 40px 40px, cover, contain\] at (-0.3) should be [0px 0px, 0px 0px, contain, cover\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [0px 0px, 0px 0px, contain, cover\] to [40px 40px, 40px 40px, cover, contain\] at (0) should be [0px 0px, 0px 0px, contain, cover\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [0px 0px, 0px 0px, contain, cover\] to [40px 40px, 40px 40px, cover, contain\] at (0.3) should be [0px 0px, 0px 0px, contain, cover\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [0px auto, 0px 0px\] to [auto 40px, 40px 40px\] at (-0.3) should be [0px auto, 0px 0px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [0px auto, 0px 0px\] to [auto 40px, 40px 40px\] at (0) should be [0px auto, 0px 0px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <background-size> from [0px auto, 0px 0px\] to [auto 40px, 40px 40px\] at (0.3) should be [0px auto, 0px 0px\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/border-image-slice-interpolation.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/border-image-slice-interpolation.html.ini
index ebd59349ec6..6ff2fac8352 100644
--- a/tests/wpt/metadata/css/css-backgrounds/animations/border-image-slice-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/border-image-slice-interpolation.html.ini
@@ -380,3 +380,47 @@
   [CSS Animations: property <border-image-slice> from [0% fill\] to [50%\] at (0.6) should be [50%\]]
     expected: FAIL
 
+  [CSS Transitions: property <border-image-slice> from [0% fill\] to [50%\] at (-0.3) should be [0% fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% fill\] to [50%\] at (0) should be [0% fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% fill\] to [50%\] at (0.3) should be [0% fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [50%\] to [100\] at (-0.3) should be [50%\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [50%\] to [100\] at (0) should be [50%\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [50%\] to [100\] at (0.3) should be [50%\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [50% fill\] to [100 fill\] at (-0.3) should be [50% fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [50% fill\] to [100 fill\] at (0) should be [50% fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [50% fill\] to [100 fill\] at (0.3) should be [50% fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% 10 20% 30 fill\] to [40% 50 60% 70\] at (-0.3) should be [0% 10 20% 30 fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% 10 20% 30 fill\] to [40% 50 60% 70\] at (0) should be [0% 10 20% 30 fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% 10 20% 30 fill\] to [40% 50 60% 70\] at (0.3) should be [0% 10 20% 30 fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% 10 20 30 fill\] to [40 50 60% 70\] at (-0.3) should be [0% 10 20 30 fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% 10 20 30 fill\] to [40 50 60% 70\] at (0) should be [0% 10 20 30 fill\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-slice> from [0% 10 20 30 fill\] to [40 50 60% 70\] at (0.3) should be [0% 10 20 30 fill\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/border-image-width-interpolation.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/border-image-width-interpolation.html.ini
index 59720333a3e..9b0499271c4 100644
--- a/tests/wpt/metadata/css/css-backgrounds/animations/border-image-width-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/border-image-width-interpolation.html.ini
@@ -485,3 +485,65 @@
   [Web Animations: property <border-image-width> from [10px\] to [20\] at (0.3) should be [10px\]]
     expected: FAIL
 
+  [CSS Transitions: property <border-image-width> from [initial\] to [20px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [initial\] to [20px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [initial\] to [20px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [unset\] to [20px\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [unset\] to [20px\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [unset\] to [20px\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10px auto auto 20\] to [110px auto 120 auto\] at (-0.3) should be [10px auto auto 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10px auto auto 20\] to [110px auto 120 auto\] at (0) should be [10px auto auto 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10px auto auto 20\] to [110px auto 120 auto\] at (0.3) should be [10px auto auto 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10px\] to [20\] at (-0.3) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10px\] to [20\] at (0) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10px\] to [20\] at (0.3) should be [10px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10\] to [20px\] at (-0.3) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10\] to [20px\] at (0) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10\] to [20px\] at (0.3) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10%\] to [20\] at (-0.3) should be [10%\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10%\] to [20\] at (0) should be [10%\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10%\] to [20\] at (0.3) should be [10%\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10\] to [20%\] at (-0.3) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10\] to [20%\] at (0) should be [10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <border-image-width> from [10\] to [20%\] at (0.3) should be [10\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/box-shadow-interpolation.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
index 3019a3d1413..016af7475e7 100644
--- a/tests/wpt/metadata/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/box-shadow-interpolation.html.ini
@@ -259,3 +259,12 @@
 
   [Web Animations: property <box-shadow> from [inset 0 0 0 0 black\] to [inset 0 0 0 calc(max(10em, 20px) / 2) black\] at (1.5) should be [rgb(0, 0, 0) 0px 0px 0px 22.5px inset\]]
     expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 20px yellow, 5px 10px green\] to [inset 5px 10px green, 15px 20px blue\] at (-0.3) should be [10px 20px yellow, 5px 10px green\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 20px yellow, 5px 10px green\] to [inset 5px 10px green, 15px 20px blue\] at (0) should be [10px 20px yellow, 5px 10px green\]]
+    expected: FAIL
+
+  [CSS Transitions: property <box-shadow> from [10px 20px yellow, 5px 10px green\] to [inset 5px 10px green, 15px 20px blue\] at (0.3) should be [10px 20px yellow, 5px 10px green\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/animation/flex-basis-interpolation.html.ini b/tests/wpt/metadata/css/css-flexbox/animation/flex-basis-interpolation.html.ini
index faaf5303358..9a2f99ede47 100644
--- a/tests/wpt/metadata/css/css-flexbox/animation/flex-basis-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-flexbox/animation/flex-basis-interpolation.html.ini
@@ -158,3 +158,20 @@
   [Web Animations: property <flex-basis> from [inherit\] to [2%\] at (0.6) should be [2.4%\]]
     expected: FAIL
 
+  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <flex-basis> from [initial\] to [2%\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <flex-basis> from [unset\] to [2%\] at (0.3) should be [unset\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini b/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
deleted file mode 100644
index b8f8d45a31f..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/hittest-anonymous-box.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[hittest-anonymous-box.html]
-  [Hit-testing within an anonymous flex-item should return the flexbox as the hittest result.]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/animations/font-size-adjust-interpolation.html.ini b/tests/wpt/metadata/css/css-fonts/animations/font-size-adjust-interpolation.html.ini
index b2a3ee2b95a..e5fa7c3095d 100644
--- a/tests/wpt/metadata/css/css-fonts/animations/font-size-adjust-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/animations/font-size-adjust-interpolation.html.ini
@@ -1009,3 +1009,48 @@
 
   [Web Animations: property <font-size-adjust> from [ex-height 0.2\] to [cap-height 1.2\] at (1.5) should be [cap-height 1.2\]]
     expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [initial\] to [2\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [initial\] to [2\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [initial\] to [2\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [initial\] to [cap-height 2\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [initial\] to [cap-height 2\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [initial\] to [cap-height 2\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [none\] to [1.2\] at (-0.3) should be [none\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [none\] to [1.2\] at (0) should be [none\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [none\] to [1.2\] at (0.3) should be [none\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [none\] to [cap-height 1.2\] at (-0.3) should be [none\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [none\] to [cap-height 1.2\] at (0) should be [none\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [none\] to [cap-height 1.2\] at (0.3) should be [none\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [ex-height 0.2\] to [cap-height 1.2\] at (-0.3) should be [ex-height 0.2\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [ex-height 0.2\] to [cap-height 1.2\] at (0) should be [ex-height 0.2\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-size-adjust> from [ex-height 0.2\] to [cap-height 1.2\] at (0.3) should be [ex-height 0.2\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/animations/font-variation-settings-interpolation.html.ini b/tests/wpt/metadata/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
index 5dcbb2558f6..647828952bd 100644
--- a/tests/wpt/metadata/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/animations/font-variation-settings-interpolation.html.ini
@@ -866,3 +866,47 @@
   [CSS Transitions with transition: all: property <font-variation-settings> from ['test' 20\] to ['test' 30\] at (1) should be ['test' 30\]]
     expected: FAIL
 
+  [CSS Transitions: property <font-variation-settings> from [initial\] to ['test' 50\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from [initial\] to ['test' 50\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from [initial\] to ['test' 50\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['test' 20\] to [normal\] at (-0.3) should be ['test' 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['test' 20\] to [normal\] at (0) should be ['test' 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['test' 20\] to [normal\] at (0.3) should be ['test' 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 0, 'bbbb' 10\] to ['aaaa' 10, 'bbbb' 20, 'cccc' 30\] at (-0.3) should be ['aaaa' 0, 'bbbb' 10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 0, 'bbbb' 10\] to ['aaaa' 10, 'bbbb' 20, 'cccc' 30\] at (0) should be ['aaaa' 0, 'bbbb' 10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 0, 'bbbb' 10\] to ['aaaa' 10, 'bbbb' 20, 'cccc' 30\] at (0.3) should be ['aaaa' 0, 'bbbb' 10\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 10, 'bbbb' 20, 'cccc' 30\] to ['aaaa' 0, 'bbbb' 10\] at (-0.3) should be ['aaaa' 10, 'bbbb' 20, 'cccc' 30\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 10, 'bbbb' 20, 'cccc' 30\] to ['aaaa' 0, 'bbbb' 10\] at (0) should be ['aaaa' 10, 'bbbb' 20, 'cccc' 30\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 10, 'bbbb' 20, 'cccc' 30\] to ['aaaa' 0, 'bbbb' 10\] at (0.3) should be ['aaaa' 10, 'bbbb' 20, 'cccc' 30\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 0, 'bbbb' 10, 'cccc' 20\] to ['dddd' 10, 'eeee' 20, 'ffff' 30\] at (-0.3) should be ['aaaa' 0, 'bbbb' 10, 'cccc' 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 0, 'bbbb' 10, 'cccc' 20\] to ['dddd' 10, 'eeee' 20, 'ffff' 30\] at (0) should be ['aaaa' 0, 'bbbb' 10, 'cccc' 20\]]
+    expected: FAIL
+
+  [CSS Transitions: property <font-variation-settings> from ['aaaa' 0, 'bbbb' 10, 'cccc' 20\] to ['dddd' 10, 'eeee' 20, 'ffff' 30\] at (0.3) should be ['aaaa' 0, 'bbbb' 10, 'cccc' 20\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering-2.html.ini b/tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering-2.html.ini
new file mode 100644
index 00000000000..722e601f6eb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering-2.html.ini
@@ -0,0 +1,2 @@
+[image-set-negative-resolution-rendering-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering.html.ini b/tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering.html.ini
new file mode 100644
index 00000000000..a5b715bce70
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-set/image-set-negative-resolution-rendering.html.ini
@@ -0,0 +1,2 @@
+[image-set-negative-resolution-rendering.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini b/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini
index 9da0a1ece61..80f8e11c556 100644
--- a/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini
+++ b/tests/wpt/metadata/css/css-images/image-set/image-set-parsing.html.ini
@@ -259,3 +259,51 @@
 
   [e.style['background-image'\] = "-webkit-image-set(url(example.png) 1x type('image/jpeg'))" should set the property value]
     expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") 0x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") 0x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") 0dppx)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") 0dppx)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") 0dpi)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") 0dpi)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") 0dpcm)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") 0dpcm)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") -1x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") -1x)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") -3dppx)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") -3dppx)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") -96dpi)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") -96dpi)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "image-set(url(\\"example.png\\") -113dpcm)" should set the property value]
+    expected: FAIL
+
+  [e.style['background-image'\] = "-webkit-image-set(url(\\"example.png\\") -113dpcm)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering-2.html.ini b/tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering-2.html.ini
deleted file mode 100644
index 778000386d8..00000000000
--- a/tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-zero-resolution-rendering-2.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering.html.ini b/tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering.html.ini
deleted file mode 100644
index f2243377a7f..00000000000
--- a/tests/wpt/metadata/css/css-images/image-set/image-set-zero-resolution-rendering.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[image-set-zero-resolution-rendering.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
index f0166fb6c37..d581570f66d 100644
--- 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
@@ -587,3 +587,11 @@
   [CSS Transitions: property <tab-size> from neutral to [10\] at (1.5) should be [12.5\]]
     expected: FAIL
 
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (-0.3) should be [1\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0) should be [1\]]
+    expected: FAIL
+
+  [CSS Transitions: property <tab-size> from [1\] to [10px\] at (0.3) should be [1\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/animations/text-indent-interpolation.html.ini b/tests/wpt/metadata/css/css-text/animations/text-indent-interpolation.html.ini
index 2f8d27b8325..1dd1537e700 100644
--- a/tests/wpt/metadata/css/css-text/animations/text-indent-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-text/animations/text-indent-interpolation.html.ini
@@ -404,3 +404,20 @@
   [CSS Animations: property <text-indent> from [0px each-line\] to [50px hanging\] at (-0.3) should be [0px each-line\]]
     expected: FAIL
 
+  [CSS Transitions: property <text-indent> from [0px each-line\] to [50px hanging\] at (-0.3) should be [0px each-line\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-indent> from [0px each-line\] to [50px hanging\] at (0) should be [0px each-line\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-indent> from [0px each-line\] to [50px hanging\] at (0.3) should be [0px each-line\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-indent> from [0px\] to [50px each-line hanging\] at (-0.3) should be [0px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-indent> from [0px\] to [50px each-line hanging\] at (0) should be [0px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-indent> from [0px\] to [50px each-line hanging\] at (0.3) should be [0px\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-align/text-align-last-interpolation.html.ini b/tests/wpt/metadata/css/css-text/text-align/text-align-last-interpolation.html.ini
index d8cf965615a..97d1aa4a332 100644
--- a/tests/wpt/metadata/css/css-text/text-align/text-align-last-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-text/text-align/text-align-last-interpolation.html.ini
@@ -334,3 +334,39 @@
 
   [Web Animations: property <text-align-last> from [end\] to [match-parent\] at (1.5) should be [match-parent\]]
     expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [auto\] to [start\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [auto\] to [start\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [auto\] to [start\] at (0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [justify\] to [center\] at (-0.3) should be [justify\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [justify\] to [center\] at (0) should be [justify\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [justify\] to [center\] at (0.3) should be [justify\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [left\] to [right\] at (-0.3) should be [left\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [left\] to [right\] at (0) should be [left\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [left\] to [right\] at (0.3) should be [left\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [end\] to [match-parent\] at (-0.3) should be [end\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [end\] to [match-parent\] at (0) should be [end\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-align-last> from [end\] to [match-parent\] at (0.3) should be [end\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-justify/text-justify-interpolation.html.ini b/tests/wpt/metadata/css/css-text/text-justify/text-justify-interpolation.html.ini
index 416d011d27a..9ddf45dbf47 100644
--- a/tests/wpt/metadata/css/css-text/text-justify/text-justify-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-text/text-justify/text-justify-interpolation.html.ini
@@ -373,3 +373,39 @@
 
   [Web Animations: property <text-justify> from [distribute\] to [none\] at (1.5) should be [none\]]
     expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [auto\] to [inter-character\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [auto\] to [inter-character\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [auto\] to [inter-character\] at (0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [inter-character\] to [distribute\] at (-0.3) should be [inter-character\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [inter-character\] to [distribute\] at (0) should be [inter-character\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [inter-character\] to [distribute\] at (0.3) should be [inter-character\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [inter-word\] to [distribute\] at (-0.3) should be [inter-word\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [inter-word\] to [distribute\] at (0) should be [inter-word\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [inter-word\] to [distribute\] at (0.3) should be [inter-word\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [distribute\] to [none\] at (-0.3) should be [distribute\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [distribute\] to [none\] at (0) should be [distribute\]]
+    expected: FAIL
+
+  [CSS Transitions: property <text-justify> from [distribute\] to [none\] at (0.3) should be [distribute\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/text-wrap-balance-dynamic-001.html.ini b/tests/wpt/metadata/css/css-text/white-space/text-wrap-balance-dynamic-001.html.ini
new file mode 100644
index 00000000000..55286b7a73b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/text-wrap-balance-dynamic-001.html.ini
@@ -0,0 +1,2 @@
+[text-wrap-balance-dynamic-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html.ini
deleted file mode 100644
index b9463b3ee1e..00000000000
--- a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[trailing-other-space-separators-break-spaces-005.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html.ini
deleted file mode 100644
index c4ec0fbcc2f..00000000000
--- a/tests/wpt/metadata/css/css-text/white-space/trailing-other-space-separators-break-spaces-012.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[trailing-other-space-separators-break-spaces-012.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/animation/perspective-interpolation.html.ini b/tests/wpt/metadata/css/css-transforms/animation/perspective-interpolation.html.ini
index de076640a45..ee8a9d9b91a 100644
--- a/tests/wpt/metadata/css/css-transforms/animation/perspective-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/animation/perspective-interpolation.html.ini
@@ -271,3 +271,30 @@
 
   [Web Animations: property <perspective> from [0px\] to [10px\] at (1.5) should be [15px\]]
     expected: FAIL
+
+  [CSS Transitions: property <perspective> from [initial\] to [20px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [initial\] to [20px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [initial\] to [20px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [unset\] to [20px\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [unset\] to [20px\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [unset\] to [20px\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [50px\] to [none\] at (-0.3) should be [50px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [50px\] to [none\] at (0) should be [50px\]]
+    expected: FAIL
+
+  [CSS Transitions: property <perspective> from [50px\] to [none\] at (0.3) should be [50px\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/all-with-discrete.tentative.html.ini b/tests/wpt/metadata/css/css-transitions/all-with-discrete.tentative.html.ini
new file mode 100644
index 00000000000..681921b3a6d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/all-with-discrete.tentative.html.ini
@@ -0,0 +1,6 @@
+[all-with-discrete.tentative.html]
+  [all with an explicit discrete property should animate.]
+    expected: FAIL
+
+  [all without an explicit discrete property should not animate.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini b/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini
index b86d9c224b8..5862af63ee7 100644
--- a/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini
@@ -196,3 +196,30 @@
 
   [Web Animations: property <vertical-align> from [40px\] to [40%\] at (1) should be [40%\]]
     expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [initial\] to [40px\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [initial\] to [40px\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [initial\] to [40px\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [unset\] to [40px\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [unset\] to [40px\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [unset\] to [40px\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [super\] to [40%\] at (-0.3) should be [super\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [super\] to [40%\] at (0) should be [super\]]
+    expected: FAIL
+
+  [CSS Transitions: property <vertical-align> from [super\] to [40%\] at (0.3) should be [super\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini b/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini
index ae785c0f3cf..f905d0ad084 100644
--- a/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini
@@ -218,3 +218,29 @@
   [CSS Animations: property <z-index> from [auto\] to [10\] at (0.6) should be [10\]]
     expected: FAIL
 
+  [CSS Transitions: property <z-index> from [initial\] to [5\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [initial\] to [5\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [initial\] to [5\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [unset\] to [5\] at (-0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [unset\] to [5\] at (0) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [unset\] to [5\] at (0.3) should be [unset\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [auto\] to [10\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [auto\] to [10\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <z-index> from [auto\] to [10\] at (0.3) should be [auto\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/display-none-no-animations.html.ini b/tests/wpt/metadata/css/css-transitions/display-none-no-animations.html.ini
new file mode 100644
index 00000000000..cdaafe61df8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/display-none-no-animations.html.ini
@@ -0,0 +1,3 @@
+[display-none-no-animations.html]
+  [Transitions and animations should not occur on display:none elements.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-ui/animation/accent-color-interpolation.html.ini b/tests/wpt/metadata/css/css-ui/animation/accent-color-interpolation.html.ini
index 73cb6b61a71..9d742425719 100644
--- a/tests/wpt/metadata/css/css-ui/animation/accent-color-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-ui/animation/accent-color-interpolation.html.ini
@@ -526,3 +526,21 @@
 
   [Web Animations: property <accent-color> from [black\] to [orange\] at (1.5) should be [rgb(255, 248, 0)\]]
     expected: FAIL
+
+  [CSS Transitions: property <accent-color> from [initial\] to [green\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <accent-color> from [initial\] to [green\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <accent-color> from [initial\] to [green\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <accent-color> from [auto\] to [green\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <accent-color> from [auto\] to [green\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <accent-color> from [auto\] to [green\] at (0.3) should be [auto\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-ui/animation/caret-color-interpolation.html.ini b/tests/wpt/metadata/css/css-ui/animation/caret-color-interpolation.html.ini
index 53cf77de076..50b1587d731 100644
--- a/tests/wpt/metadata/css/css-ui/animation/caret-color-interpolation.html.ini
+++ b/tests/wpt/metadata/css/css-ui/animation/caret-color-interpolation.html.ini
@@ -530,3 +530,20 @@
   [CSS Transitions with transition: all: property <caret-color> from [inherit\] to [green\] at (-0.3) should be [rgb(0, 0, 255)\]]
     expected: FAIL
 
+  [CSS Transitions: property <caret-color> from [initial\] to [green\] at (-0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <caret-color> from [initial\] to [green\] at (0) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <caret-color> from [initial\] to [green\] at (0.3) should be [initial\]]
+    expected: FAIL
+
+  [CSS Transitions: property <caret-color> from [auto\] to [green\] at (-0.3) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <caret-color> from [auto\] to [green\] at (0) should be [auto\]]
+    expected: FAIL
+
+  [CSS Transitions: property <caret-color> from [auto\] to [green\] at (0.3) should be [auto\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/calc-infinity-nan-serialize-angle.html.ini b/tests/wpt/metadata/css/css-values/calc-infinity-nan-serialize-angle.html.ini
index 92cadc09b02..9db9382b8e7 100644
--- a/tests/wpt/metadata/css/css-values/calc-infinity-nan-serialize-angle.html.ini
+++ b/tests/wpt/metadata/css/css-values/calc-infinity-nan-serialize-angle.html.ini
@@ -88,3 +88,12 @@
 
   ['rotate(calc(1deg * clamp(-inFinity, infinity, 10)))' as a specified value should serialize as 'rotate(calc(10deg))'.]
     expected: FAIL
+
+  ['rotate(calc(1rad * NaN))' as a specified value should serialize as 'rotate(calc(NaN * 1deg))'.]
+    expected: FAIL
+
+  ['rotate(calc(1turn * NaN))' as a specified value should serialize as 'rotate(calc(NaN * 1deg))'.]
+    expected: FAIL
+
+  ['rotate(calc(1grad * nan))' as a specified value should serialize as 'rotate(calc(NaN * 1deg))'.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-computed.html.ini b/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-computed.html.ini
index 5e525b98125..ec587258b61 100644
--- a/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-computed.html.ini
+++ b/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-computed.html.ini
@@ -112,3 +112,24 @@
 
   [hypot(1turn) should be used-value-equivalent to 1turn]
     expected: FAIL
+
+  [hypot(3e+9px, 4e+9px) should be used-value-equivalent to 5e+9px]
+    expected: FAIL
+
+  [calc(3px * pow(20, 4)) should be used-value-equivalent to 480000px]
+    expected: FAIL
+
+  [calc(-2 * hypot(3px, 4px)) should be used-value-equivalent to -10px]
+    expected: FAIL
+
+  [hypot(0% + 3px, 0% + 4px) should be used-value-equivalent to 5px]
+    expected: FAIL
+
+  [hypot(0% + 772.333px) should be used-value-equivalent to calc(0% + 772.333px)]
+    expected: FAIL
+
+  [hypot(0% + 772.35px) should be used-value-equivalent to calc(0% + 772.35px)]
+    expected: FAIL
+
+  [hypot(0% + 600px, 0% + 800px) should be used-value-equivalent to 1000px]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-serialize.html.ini b/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-serialize.html.ini
index 80e19ba3296..e9fc10d976c 100644
--- a/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-serialize.html.ini
+++ b/tests/wpt/metadata/css/css-values/hypot-pow-sqrt-serialize.html.ini
@@ -61,3 +61,27 @@
 
   ['scale(calc(sqrt(1) - 1))' as a computed value should serialize as 'matrix(0, 0, 0, 0, 0, 0)'.]
     expected: FAIL
+
+  ['calc(pow(1,1) - 0.5)' as a specified value should serialize as 'calc(0.5)'.]
+    expected: FAIL
+
+  ['scale(calc(pow(1,1) - 0.5))' as a specified value should serialize as 'scale(calc(0.5))'.]
+    expected: FAIL
+
+  ['calc(pow(1,1) - 0.5)' as a computed value should serialize as '0.5'.]
+    expected: FAIL
+
+  ['scale(calc(pow(1,1) - 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.]
+    expected: FAIL
+
+  ['calc(hypot(1) * 0.5)' as a specified value should serialize as 'calc(0.5)'.]
+    expected: FAIL
+
+  ['scale(calc(hypot(1) * 0.5))' as a specified value should serialize as 'scale(calc(0.5))'.]
+    expected: FAIL
+
+  ['calc(hypot(1) * 0.5)' as a computed value should serialize as '0.5'.]
+    expected: FAIL
+
+  ['scale(calc(hypot(1) * 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
new file mode 100644
index 00000000000..cf67b5d03dd
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-dynamic-anon-box.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-dynamic-anon-box.html]
+  [Link should be clickable after hiding a scrollbox with an anonymous table inside]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
deleted file mode 100644
index b905fe70fcb..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-ellipsis-in-inline-box.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[elementFromPoint-ellipsis-in-inline-box.html]
-  [elementFromPoint-ellipsis-in-inline-box]
-    expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
new file mode 100644
index 00000000000..8f6f663ba61
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-subpixel.html.ini
@@ -0,0 +1,3 @@
+[elementFromPoint-subpixel.html]
+  [Hit test top left corner of box]
+    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..a3496a40d07
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,3 @@
+[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/filter-effects/animation/backdrop-filter-interpolation-001.html.ini b/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-001.html.ini
index abd513f8af5..4cf6e0494ed 100644
--- a/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-001.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-001.html.ini
@@ -824,3 +824,11 @@
   [CSS Transitions: property <backdrop-filter> from [none\] to [hue-rotate(180deg)\] at (-0.5) should be [hue-rotate(-90deg)\]]
     expected: FAIL
 
+  [CSS Transitions: property <backdrop-filter> from [url("#svgfilter")\] to [blur(5px)\] at (-0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <backdrop-filter> from [url("#svgfilter")\] to [blur(5px)\] at (0) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <backdrop-filter> from [url("#svgfilter")\] to [blur(5px)\] at (0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-002.html.ini b/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-002.html.ini
index c5e2954bc0b..f414017961d 100644
--- a/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-002.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-002.html.ini
@@ -263,3 +263,11 @@
   [CSS Transitions: property <backdrop-filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (1.5) should be [blur(10px)\]]
     expected: FAIL
 
+  [CSS Transitions: property <backdrop-filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (-0.3) should be [grayscale(0) blur(0px)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <backdrop-filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0) should be [grayscale(0) blur(0px)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <backdrop-filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0.3) should be [grayscale(0) blur(0px)\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-003.html.ini b/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-003.html.ini
index e7375e403e4..f2a59bfd261 100644
--- a/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-003.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/animation/backdrop-filter-interpolation-003.html.ini
@@ -737,3 +737,11 @@
   [CSS Animations: property <backdrop-filter> from [brightness(0)\] to [none\] at (0) should be [brightness(0)\]]
     expected: FAIL
 
+  [CSS Transitions: property <backdrop-filter> from [url("#svgfilter")\] to [none\] at (-0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <backdrop-filter> from [url("#svgfilter")\] to [none\] at (0) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <backdrop-filter> from [url("#svgfilter")\] to [none\] at (0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-002.html.ini b/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-002.html.ini
index e96c95d709e..c25ecb990ec 100644
--- a/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-002.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-002.html.ini
@@ -236,3 +236,11 @@
   [CSS Transitions with transition: all: property <filter> from [drop-shadow(0px 0px 0px currentcolor)\] to [drop-shadow(20px 10px green)\] at (0) should be [drop-shadow(0px 0px 0px currentcolor)\]]
     expected: FAIL
 
+  [CSS Transitions: property <filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (-0.3) should be [grayscale(0) blur(0px)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0) should be [grayscale(0) blur(0px)\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [grayscale(0) blur(0px)\] to [blur(10px)\] at (0.3) should be [grayscale(0) blur(0px)\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-003.html.ini b/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-003.html.ini
index 7f0c2cf3c8a..81b61549669 100644
--- a/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-003.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/animation/filter-interpolation-003.html.ini
@@ -524,3 +524,20 @@
   [Web Animations: property <filter> from [none\] to [hue-rotate(360deg)\] at (1) should be [hue-rotate(360deg)\]]
     expected: FAIL
 
+  [CSS Transitions: property <filter> from [url("#svgfilter")\] to [none\] at (-0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [url("#svgfilter")\] to [none\] at (0) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [url("#svgfilter")\] to [none\] at (0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [url("#svgfilter")\] to [blur(5px)\] at (-0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [url("#svgfilter")\] to [blur(5px)\] at (0) should be [url("#svgfilter")\]]
+    expected: FAIL
+
+  [CSS Transitions: property <filter> from [url("#svgfilter")\] to [blur(5px)\] at (0.3) should be [url("#svgfilter")\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/css/selectors/invalidation/nth-child-of-attr-largedom.html.ini b/tests/wpt/metadata/css/selectors/invalidation/nth-child-of-attr-largedom.html.ini
new file mode 100644
index 00000000000..1bcc0216ca6
--- /dev/null
+++ b/tests/wpt/metadata/css/selectors/invalidation/nth-child-of-attr-largedom.html.ini
@@ -0,0 +1,2 @@
+[nth-child-of-attr-largedom.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
index 54e2e5293bc..f2dee7b3ea9 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/history-traversal/srcdoc/consecutive-srcdoc.html.ini
@@ -1,7 +1,6 @@
 [consecutive-srcdoc.html]
-  expected: TIMEOUT
   [changing srcdoc does a replace navigation since the URL is still about:srcdoc]
-    expected: TIMEOUT
+    expected: FAIL
 
   [changing srcdoc to about:srcdoc#yo then another srcdoc does two push navigations and we can navigate back]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
index 33efcdbcf48..f7ee5361549 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/005.html.ini
@@ -1,3 +1,4 @@
 [005.html]
+  expected: TIMEOUT
   [Link with onclick navigation and href navigation ]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
deleted file mode 100644
index 60a4fa51f8a..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/replace-before-load/a-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[a-click.html]
-  [aElement.click() before the load event must NOT replace]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
deleted file mode 100644
index 4b4820d1729..00000000000
--- a/tests/wpt/metadata/html/browsers/the-window-object/open-close/creating_browsing_context_test_01.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[creating_browsing_context_test_01.html]
-  [first argument: absolute url]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html.ini b/tests/wpt/metadata/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html.ini
index d4431be4f1b..15ef6c1467d 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html.ini
@@ -1,3 +1,4 @@
 [2d.conformance.requirements.basics.html]
+  expected: ERROR
   [void methods return undefined]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini b/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini
index b1823dc9552..b573ace6569 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html.ini
@@ -1,4 +1,4 @@
 [2d.fillRect.shadow.html]
+  expected: ERROR
   [fillRect draws shadows]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html.ini b/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html.ini
index 6b8701c8f7d..2a1e822043f 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html.ini
@@ -1,4 +1,4 @@
 [2d.strokeRect.shadow.html]
+  expected: ERROR
   [strokeRect draws shadows]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html.ini
index 4451a7d8a32..5076fdc34a9 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.blur.exceptions.tentative.html]
+  expected: ERROR
   [Test exceptions on CanvasFilter() blur.object]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html.ini
index 61dafe7fce7..0d2c77b6eb8 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.colorMatrix.tentative.html]
+  expected: ERROR
   [Test the functionality of ColorMatrix filters in CanvasFilter objects]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini
index 8c7cb3e0057..56e4dc27b3b 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html]
+  expected: ERROR
   [Test pixels on CanvasFilter() componentTransfer with discrete type]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini
index 53f59082097..9cf3fa0d1bb 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html]
+  expected: ERROR
   [Test pixels on CanvasFilter() componentTransfer with gamma type]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini
index aebe150b830..d709e2ffbbc 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html]
+  expected: ERROR
   [Test pixels on CanvasFilter() componentTransfer with identity type]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini
index 4057e21a548..f0f9c944cdf 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html]
+  expected: ERROR
   [Test pixels on CanvasFilter() componentTransfer with linear type]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini
index 19140a3824d..a6e2e3fc654 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.componentTransfer.table.tentative.html]
+  expected: ERROR
   [Test pixels on CanvasFilter() componentTransfer with table type]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html.ini
index a320e4cfcb4..c2c7d4032c4 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html]
+  expected: ERROR
   [Test exceptions on CanvasFilter() convolveMatrix]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html.ini
index 55f19cf5246..5870bdd7a33 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.tentative.html]
+  expected: ERROR
   [Test CanvasFilter() object]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html.ini
index 7b14ef25b2d..a7abaf5ac56 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html]
+  expected: ERROR
   [Test exceptions on CanvasFilter() turbulence object]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.value.html.ini b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.value.html.ini
index 51650ad4d05..ee935234162 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.value.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/filters/2d.filter.value.html.ini
@@ -1,3 +1,4 @@
 [2d.filter.value.html]
+  expected: ERROR
   [test if ctx.filter works correctly]
-    expected: FAIL
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
index 8e7dad6133e..f388c81dcb7 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html.ini
@@ -1,4 +1,4 @@
 [2d.imageData.create2.nonfinite.html]
+  expected: ERROR
   [createImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini
new file mode 100644
index 00000000000..9b358a2e7c5
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html.ini
@@ -0,0 +1,2 @@
+[2d.imageData.get.large.crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini
new file mode 100644
index 00000000000..f25c4242f03
--- /dev/null
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js.ini
@@ -0,0 +1,4 @@
+[2d.imageData.get.large.crash.worker.html]
+  expected: TIMEOUT
+  [Test that canvas crash when image data cannot be allocated.]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
index 8ecd9e5dc7f..b490d0c70e4 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html.ini
@@ -1,4 +1,4 @@
 [2d.imageData.get.nonfinite.html]
+  expected: ERROR
   [getImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html.ini
index df4e4f1b0aa..7801ffc2beb 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html.ini
@@ -1,4 +1,4 @@
 [2d.imageData.get.source.outside.html]
+  expected: ERROR
   [getImageData() returns transparent black outside the canvas]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
index 025b8cfdc5d..e96e8b3aecb 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html.ini
@@ -1,4 +1,4 @@
 [2d.imageData.put.nonfinite.html]
+  expected: ERROR
   [putImageData() throws TypeError if arguments are not finite]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html.ini b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html.ini
index 2cec1487d8c..acfa51e8949 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html.ini
@@ -1,4 +1,4 @@
 [2d.imageData.put.unchanged.html]
+  expected: ERROR
   [putImageData(getImageData(...), ...) has no effect]
-    expected: FAIL
-
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html.ini b/tests/wpt/metadata/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html.ini
index c10a8cc7474..3f898c695f7 100644
--- a/tests/wpt/metadata/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html.ini
+++ b/tests/wpt/metadata/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html.ini
@@ -1,3 +1,4 @@
 [2d.color.space.p3.to.p3.html]
+  expected: ERROR
   [test getImageData with display-p3 and uint8 from display p3 uint8 canvas]
-    expected: FAIL
+    expected: TIMEOUT
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 58a99633547..d169bd2e9fa 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,19 +1,15 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    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 6f7461b9472..f9138fb999a 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,4 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
index 3cdeb8ebcbc..47b45e65a1c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -1,3 +1,9 @@
 [non-active-document.html]
   [DOMParser]
     expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html.ini
new file mode 100644
index 00000000000..023862a6fed
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html.ini
@@ -0,0 +1,6 @@
+[dialog-form-submission-unusual.html]
+  [A form's action and rel=noopener are ignored during submission]
+    expected: FAIL
+
+  [A form's action and rel=noopener are ignored during submission, part 2]
+    expected: FAIL
diff --git a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini b/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
deleted file mode 100644
index b8bdf33cb65..00000000000
--- a/tests/wpt/metadata/html/syntax/parsing/DOMContentLoaded-defer.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[DOMContentLoaded-defer.html]
-  [The end: DOMContentLoaded and defer scripts]
-    expected: FAIL
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
new file mode 100644
index 00000000000..f9a4f08cd70
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-tla-delayed.html.ini
@@ -0,0 +1,3 @@
+[module-tla-delayed.html]
+  [document.write in an imported module]
+    expected: FAIL
diff --git a/tests/wpt/metadata/url/failure.html.ini b/tests/wpt/metadata/url/failure.html.ini
index 687faf36668..1104a5692ed 100644
--- a/tests/wpt/metadata/url/failure.html.ini
+++ b/tests/wpt/metadata/url/failure.html.ini
@@ -656,3 +656,12 @@
 
   [window.open():  should throw]
     expected: FAIL
+
+  [Location's href: https://­/ should throw]
+    expected: FAIL
+
+  [Location's href: https://%C2%AD/ should throw]
+    expected: FAIL
+
+  [Location's href: https://xn--/ should throw]
+    expected: FAIL
diff --git a/tests/wpt/metadata/url/url-setters-a-area.window.js.ini b/tests/wpt/metadata/url/url-setters-a-area.window.js.ini
index 3b91d7fe16b..f79aee18b6c 100644
--- a/tests/wpt/metadata/url/url-setters-a-area.window.js.ini
+++ b/tests/wpt/metadata/url/url-setters-a-area.window.js.ini
@@ -1351,6 +1351,30 @@
   [<area>: Setting <https://www.google.com:4343>.port = '4wpt' Should use all ascii prefixed characters as port]
     expected: FAIL
 
+  [<area>: Setting <https://example.com/>.host = 'a%C2%ADb']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.host = '­']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.host = '%C2%AD']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.host = 'xn--']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.hostname = 'a%C2%ADb']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.hostname = '­']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.hostname = '%C2%AD']
+    expected: FAIL
+
+  [<area>: Setting <https://example.com/>.hostname = 'xn--']
+    expected: FAIL
+
 
 [url-setters-a-area.window.html?include=mailto]
   [<area>: Setting <mailto:me@example.net>.protocol = 'http' Cannot-be-a-base URL doesn’t have a host, but URL in a special scheme must.]
diff --git a/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini b/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
index 04c2032c723..39d039a0132 100644
--- a/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
+++ b/tests/wpt/metadata/webmessaging/broadcastchannel/cross-partition.https.tentative.html.ini
@@ -1,5 +1,5 @@
 [cross-partition.https.tentative.html]
-  expected: TIMEOUT
+  expected: CRASH
   [BroadcastChannel messages aren't received from a cross-partition iframe]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index c7946fc91b4..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
diff --git a/tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini b/tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
new file mode 100644
index 00000000000..aa6c9e5b826
--- /dev/null
+++ b/tests/wpt/metadata/webstorage/localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html.ini
@@ -0,0 +1,4 @@
+[localstorage-about-blank-3P-iframe-opens-3P-window.partitioned.tentative.html]
+  expected: TIMEOUT
+  [StorageKey: test 3P about:blank window opened from a 3P iframe]
+    expected: TIMEOUT
diff --git a/tests/wpt/metadata/xhr/send-timeout-events.htm.ini b/tests/wpt/metadata/xhr/send-timeout-events.htm.ini
new file mode 100644
index 00000000000..667372a9597
--- /dev/null
+++ b/tests/wpt/metadata/xhr/send-timeout-events.htm.ini
@@ -0,0 +1,2 @@
+[send-timeout-events.htm]
+  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini b/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
deleted file mode 100644
index f78f699f620..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/scrollBy.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[scrollBy.html]
-  [Ensure that the window.scrollBy function affects scroll position as expected]
-    expected: FAIL
diff --git a/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-presentation.html b/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-presentation.html
new file mode 100644
index 00000000000..138625a1534
--- /dev/null
+++ b/tests/wpt/web-platform-tests/accessibility/crashtests/aria-owns-presentation.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<div id="parent" aria-owns="owned"></div>
+<div id="owned" role="none"></div>
diff --git a/tests/wpt/web-platform-tests/accname/basic.html b/tests/wpt/web-platform-tests/accname/basic.html
new file mode 100644
index 00000000000..0df93c87996
--- /dev/null
+++ b/tests/wpt/web-platform-tests/accname/basic.html
@@ -0,0 +1,22 @@
+<!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>
+
+<div id='d' style='height: 100px; width: 100px' role="group" aria-label="test label"></div>
+<h1 id="h">test heading</h1>
+<script>
+
+promise_test(async t => {
+  const label = await test_driver.get_computed_label(document.getElementById('d'));
+  assert_true(label == "test label");
+}, "tests labelFrom: author");
+
+promise_test(async t => {
+  const label = await test_driver.get_computed_label(document.getElementById('h'));
+  assert_true(label == "test heading");
+}, "tests labelFrom: contents");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html
index d4d3acf31e6..6bb1b8257e7 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-fallback-additive-keyframe.html
@@ -16,7 +16,7 @@
 <script>
 var target = document.getElementById("target");
 target.animate([
-  { backgroundColor: 'rgb(200, 0, 0)', composite: 'accumulate' },
+  { backgroundColor: 'rgb(200, 0, 0)', composite: 'accumulate', easing: 'steps(2, end)' },
   { backgroundColor: 'rgb(0, 0, 0' }
 ], {
   duration: 1000000
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur.html
index 0685e5a7c2a..86e97b0f7e9 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-color-animation-with-blur.html
@@ -15,7 +15,7 @@
     width:  100px;
     animation-name: colorize;
     animation-duration: 100000s;
-    animation-timing-function: cubic-bezier(0, 1, 1, 0);
+    animation-timing-function: steps(2, end);
     display:  inline-block;
     margin:  10px;
   }
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html
index b584ed835c7..d49ac0828c0 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length1.html
@@ -7,7 +7,7 @@
   width: 100px;
   height: 100px;
   background-color: green;
-  animation: bgcolor2 10s, bgcolor1 0.001s;
+  animation: bgcolor2 10s steps(2, end), bgcolor1 0.001s steps(2, end);
 }
 @keyframes bgcolor1 {
   0% { background-color: rgb(0, 200, 0); }
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html
index c6822dec4cb..979414db263 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length2.html
@@ -7,7 +7,7 @@
   width: 100px;
   height: 100px;
   background-color: green;
-  animation: bgcolor2 10s, bgcolor1 2s 1s;
+  animation: bgcolor2 10s steps(2, end), bgcolor1 2s 1s steps(2, end);
 }
 @keyframes bgcolor1 {
   0% { background-color: rgb(0, 200, 0); }
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html
index e12d8a7fd2a..b727f5c64fa 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/two-background-color-animation-diff-length3.html
@@ -7,7 +7,7 @@
   width: 100px;
   height: 100px;
   background-color: green;
-  animation: bgcolor2 200s, bgcolor1 100s 0.001s;
+  animation: bgcolor2 200s steps(2, end), bgcolor1 100s 0.001s steps(2, end);
 }
 @keyframes bgcolor1 {
   0% { background-color: rgb(0, 199, 0); }
diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes-ref.html b/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes-ref.html
new file mode 100644
index 00000000000..e1822fa544e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<title>CSS Test Reference</title>
+<q style="display:block">This text must be quoted.</q>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes.html b/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes.html
new file mode 100644
index 00000000000..b88f882cd04
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/container-queries/size-container-with-quotes.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<title>CSS Container Queries Test: &lt;q&gt; element as a size container must generate quotes</title>
+<link rel="help" href="https://drafts.csswg.org/css-contain-3/#size-container">
+<link rel="match" href="size-container-with-quotes-ref.html">
+<style>
+  q {
+    container-type: inline-size;
+    display: block;
+  }
+</style>
+<q>This text must be quoted.</q>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html
similarity index 65%
rename from tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html
rename to tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html
index 5c835a3fbcc..d506c364e3b 100644
--- a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering-2.html
+++ b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering-2.html
@@ -1,15 +1,14 @@
 <!DOCTYPE html>
-<title>Image set invalid resolution rendering</title>
-<link rel="author" title="Noam Rosenthal" href="mailto:noam@webkit.org">
+<title>Image set negative resolution rendering</title>
 <link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
 <link rel="match" href="reference/image-set-rendering-ref.html">
-<meta name="assert" content="image-set rendering with zero resolution">
+<meta name="assert" content="image-set rendering with negative resolution">
 <style>
   #test {
     background-image: url("/images/red.png");
     background-image: image-set(
-      url("/images/green.png") 0x,
+      url("/images/red.png") -1x,
       url("/images/green.png") 2x
     );
     width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering.html b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering.html
new file mode 100644
index 00000000000..36fa08901ba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-negative-resolution-rendering.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>Image set negative resolution rendering</title>
+<link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
+<link rel="match" href="/css/reference/blank.html">
+<meta name="assert" content="image-set rendering with negative resolution">
+<style>
+  #test {
+    background-image: url("/images/red.png");
+    background-image: image-set(url("/images/green.png") -1x);
+    width: 100px;
+    height: 100px;
+  }
+</style>
+<div id="test"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html
index 477a3f81215..539d6d8c2f0 100644
--- a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html
+++ b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-parsing.html
@@ -142,6 +142,42 @@ function test_resolution_units_parsing() {
   );
 }
 
+function test_non_positive_resolutions_parsing() {
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") 0x)'
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") 0dppx)'
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") 0dpi)'
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") 0dpcm)'
+  );
+
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") -1x)'
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") -3dppx)'
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") -96dpi)'
+  );
+  test_valid_value_variants(
+    'background-image',
+    'image-set(url("example.png") -113dpcm)'
+  );
+}
+
 function test_gradient_images_parsing() {
   test_valid_value_variants(
     'background-image',
@@ -257,14 +293,13 @@ function test_image_set_parsing() {
 
   test_invalid_value_variants('background-image', "image-set(none, url(example.png) 1x)");
   test_invalid_value_variants('background-image', "image-set()");
-  test_invalid_value_variants('background-image', "image-set(url(example.png) 0x)");
-  test_invalid_value_variants('background-image', "image-set(url(example.png) -20x)");
   test_invalid_value_variants('background-image', "image-set('example.jpeg' 92pid url(example.png) 1x)");
   test_invalid_value_variants('background-image', "image-set(url(example.png) 1x url(example.jpeg))");
   test_invalid_value_variants('background-image', "image-set(url(example.png) 1x 2x)");
 
   test_default_resolution_parsing();
   test_resolution_units_parsing();
+  test_non_positive_resolutions_parsing();
   test_gradient_images_parsing();
   test_image_type_parsing();
   test_no_images_set_nesting();
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering.html b/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering.html
deleted file mode 100644
index d7e4eb7fdc2..00000000000
--- a/tests/wpt/web-platform-tests/css/css-images/image-set/image-set-zero-resolution-rendering.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<title>Image set invalid resolution rendering</title>
-<link rel="author" title="Noam Rosenthal" href="mailto:noam@webkit.org">
-<link rel="author" title="Traian Captan" href="mailto:tcaptan@chromium.org">
-<link rel="help" href="https://drafts.csswg.org/css-images-4/#image-set-notation">
-<link rel="match" href="reference/image-set-rendering-ref.html">
-<meta name="assert" content="image-set rendering with zero resolution">
-<style>
-  #test {
-    background-image: url("/images/red.png");
-    background-image: image-set(url("/images/green.png") 0x);
-    width: 100px;
-    height: 100px;
-  }
-</style>
-<div id="test"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html
new file mode 100644
index 00000000000..43202e4d97f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/reference/text-wrap-balance-dynamic-001-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<style>
+#container {
+  width: 20ch;
+  text-wrap: balance;
+}
+span:hover {
+  color: red;
+}
+</style>
+<div id="container">
+  123 567 901 345 789
+  123 567 901 345 789
+  123 567 901 345 789
+  999
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html b/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html
new file mode 100644
index 00000000000..8c7d27d1a34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/white-space/text-wrap-balance-dynamic-001.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="help" href="https://w3c.github.io/csswg-drafts/css-text-4/#valdef-text-wrap-balance">
+<link rel="match" href="reference/text-wrap-balance-dynamic-001-ref.html">
+<style>
+#container {
+  width: 20ch;
+  text-wrap: balance;
+}
+span:hover {
+  color: red;
+}
+</style>
+<div id="container">
+  123 567 901 345 789
+  123 567 901 345 789
+  123 567 901 345 789
+</div>
+<script>
+document.body.offsetTop;
+container.appendChild(document.createTextNode('999'));
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/all-with-discrete.tentative.html b/tests/wpt/web-platform-tests/css/css-transitions/all-with-discrete.tentative.html
new file mode 100644
index 00000000000..f12c14e4c55
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/all-with-discrete.tentative.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/4441">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id=target1 class=target>hello</div>
+<div id=target2 class=target>hello</div>
+
+<style>
+.target {
+  float: left;
+  width: 100px;
+  height: 100px;
+}
+.target.animated {
+  float: right;
+}
+
+#target1 {
+  transition: all 1s, float 1s;
+}
+
+#target2 {
+  transition: all 1s;
+}
+</style>
+
+<script>
+promise_test(async () => {
+  let transitionstartFired = false;
+  target1.addEventListener('transitionstart', () => {
+    transitionstartFired = true;
+  });
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  target1.classList.add('animated');
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  assert_true(transitionstartFired);
+}, 'all with an explicit discrete property should animate.');
+
+promise_test(async () => {
+  let transitionstartFired = false;
+  target2.addEventListener('transitionstart', () => {
+    transitionstartFired = true;
+  });
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  target2.classList.add('animated');
+  await new Promise(resolve => requestAnimationFrame(resolve));
+  assert_false(transitionstartFired);
+}, 'all without an explicit discrete property should not animate.');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/display-none-no-animations.html b/tests/wpt/web-platform-tests/css/css-transitions/display-none-no-animations.html
new file mode 100644
index 00000000000..32535baf9c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/display-none-no-animations.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<link rel=help href="mailto:jarhar@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id=target>target</div>
+<style>
+#target {
+  display: none;
+  transition: 1s;
+  color: red;
+}
+#target.animated {
+  transition: 1s;
+  color: green;
+}
+</style>
+
+<script>
+test(() => {
+  target.addEventListener('transitionstart', () => {
+    assert_unreached('transitionstart should not be fired.');
+  });
+  target.classList.add('animated');
+  assert_equals(target.getAnimations().length, 0,
+    'There should not be any animations running.');
+}, 'Transitions and animations should not occur on display:none elements.');
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-angle.html b/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-angle.html
index 884cc611056..67feefe5127 100644
--- a/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-angle.html
+++ b/tests/wpt/web-platform-tests/css/css-values/calc-infinity-nan-serialize-angle.html
@@ -14,9 +14,9 @@ function test_serialization(t,s, {prop="transform"}={}) {
 //TEST CASE                                            | EXPECTED
 var test_map = {
     "1deg * NaN"                                       :"calc(NaN * 1deg)",
-    "1rad * NaN"                                       :"calc(NaN * 1rad)",
-    "1turn * NaN"                                      :"calc(NaN * 1turn)",
-    "1grad * nan"                                      :"calc(NaN * 1grad)",
+    "1rad * NaN"                                       :"calc(NaN * 1deg)",
+    "1turn * NaN"                                      :"calc(NaN * 1deg)",
+    "1grad * nan"                                      :"calc(NaN * 1deg)",
     "1deg * infinity / infinity"                       :"calc(NaN * 1deg)",
     "1deg * 0 * infinity"                              :"calc(NaN * 1deg)",
     "1deg * (infinity + -infinity)"                    :"calc(NaN * 1deg)",
diff --git a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-computed.html b/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-computed.html
index aa4ec22edf2..3cc85a5230c 100644
--- a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-computed.html
@@ -25,12 +25,18 @@ test_math_used('calc(1px * pow(2, 3))', '8px')
 test_math_used('calc(100px * sqrt(100))', '1000px');
 test_math_used('calc(1px * pow(2, sqrt(100))', '1024px');
 test_math_used('hypot(3px, 4px)', '5px');
+test_math_used('hypot(3e+9px, 4e+9px)', '5e+9px');
 test_math_used('calc(100px * hypot(3, 4))', '500px');
 test_math_used('hypot(-5px)', '5px');
 test_math_used('calc(1px * hypot(-5))', '5px');
 test_math_used('calc(1px * hypot(10000))','10000px');
 test_math_used('calc(2px * sqrt(100000000))','20000px');
-test_math_used('calc(3px * pow(200, 4))', '33554428px');
+test_math_used('calc(3px * pow(20, 4))', '480000px');
+test_math_used('calc(-2 * hypot(3px, 4px))', '-10px');
+test_math_used('hypot(0% + 3px, 0% + 4px)', '5px');
+test_math_used('hypot(0% + 772.333px)', 'calc(0% + 772.333px)');
+test_math_used('hypot(0% + 772.35px)', 'calc(0% + 772.35px)');
+test_math_used('hypot(0% + 600px, 0% + 800px)', '1000px');
 
 //Type checking hypot
 test_math_used('hypot(1px)', '1px');
diff --git a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-serialize.html b/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-serialize.html
index d3a0bc60739..ab8c28cc592 100644
--- a/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-serialize.html
+++ b/tests/wpt/web-platform-tests/css/css-values/hypot-pow-sqrt-serialize.html
@@ -29,15 +29,15 @@ test_serialization(
     '1');
 
 test_serialization(
-    'calc(pow(1,1) + 1)',
-    'calc(2)',
-    '2');
+    'calc(pow(1,1) - 0.5)',
+    'calc(0.5)',
+    '0.5');
 test_serialization(
-    'calc(hypot(1) * 2)',
-    'calc(2)',
-    '2');
+    'calc(hypot(1) * 0.5)',
+    'calc(0.5)',
+    '0.5');
 test_serialization(
     'calc(sqrt(1) - 1)',
     'calc(0)',
     '0');
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/css/motion/animation/offset-interpolation.html b/tests/wpt/web-platform-tests/css/motion/animation/offset-interpolation.html
index 2ee011bd77a..9c3747185dc 100644
--- a/tests/wpt/web-platform-tests/css/motion/animation/offset-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/motion/animation/offset-interpolation.html
@@ -15,9 +15,9 @@
         to: 'path("M0 300H 700 Z") 600px 900deg',
         method: 'CSS Transitions',
       }, [
-        {at: -0.3, expect: 'path("M0 300H 700 Z") 470px 770deg'},
-        {at: 0, expect: 'path("M0 300H 700 Z") 500px 800deg'},
-        {at: 0.3, expect: 'path("M0 300H 700 Z") 530px 830deg'},
+        {at: -0.3, expect: 'path("M0 200H 700") 470px 770deg'},
+        {at: 0, expect: 'path("M0 200H 700") 500px 800deg'},
+        {at: 0.3, expect: 'path("M0 200H 700") 530px 830deg'},
         {at: 0.6, expect: 'path("M0 300H 700 Z") 560px 860deg'},
         {at: 1, expect: 'path("M0 300H 700 Z") 600px 900deg'},
         {at: 1.5, expect: 'path("M0 300H 700 Z") 650px 950deg'},
@@ -29,9 +29,9 @@
         to: 'path("M0 0H 300") 600px 0deg',
         method: 'CSS Transitions',
       }, [
-        {at: -0.3, expect: 'path("M0 0H 170") 470px 0deg'},
-        {at: 0, expect: 'path("M0 0H 200") 500px 0deg'},
-        {at: 0.3, expect: 'path("M0 0H 230") 530px 0deg'},
+        {at: -0.3, expect: 'path("M0 0H 170") 470px auto 0deg'},
+        {at: 0, expect: 'path("M0 0H 200") 500px auto 0deg'},
+        {at: 0.3, expect: 'path("M0 0H 230") 530px auto 0deg'},
         {at: 0.6, expect: 'path("M0 0H 260") 560px 0deg'},
         {at: 1, expect: 'path("M0 0H 300") 600px 0deg'},
         {at: 1.5, expect: 'path("M0 0H 350") 650px 0deg'},
diff --git a/tests/wpt/web-platform-tests/css/motion/offset-supports-calc.html b/tests/wpt/web-platform-tests/css/motion/offset-supports-calc.html
index 907694f7fc3..54414be0643 100644
--- a/tests/wpt/web-platform-tests/css/motion/offset-supports-calc.html
+++ b/tests/wpt/web-platform-tests/css/motion/offset-supports-calc.html
@@ -27,7 +27,7 @@ test(function(){
 
 test(function(){
   target.style = 'offset-path: ray(calc(1turn - 100grad) closest-side);';
-  assert_equals(getComputedStyle(target).offsetPath, 'ray(270deg closest-side)');
+  assert_equals(getComputedStyle(target).offsetPath, 'ray(270deg)');
 }, 'offset-path supports calc');
 
 test(function(){
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-valid.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-valid.html
index 992233d5a74..3ec10a7918f 100644
--- a/tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-valid.html
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-parsing-valid.html
@@ -18,7 +18,7 @@ test_valid_value("offset", "auto none reverse", "none reverse");
 test_valid_value("offset", "auto");
 test_valid_value("offset", "center bottom path(\"M 1 2 V 3 Z\")");
 test_valid_value("offset", "center center path(\"M 0 0 L 100 100 M 100 200 L 200 200 Z L 300 300 Z\") 100% 90deg / left bottom");
-test_valid_value("offset", "left bottom ray(0rad closest-side) 10px auto 30deg / right bottom");
+test_valid_value("offset", "left bottom ray(0rad closest-corner) 10px auto 30deg / right bottom");
 test_valid_value("offset", "left top");
 test_valid_value("offset", "none 30deg reverse", "none reverse 30deg");
 test_valid_value("offset", "none 50px reverse 30deg");
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html
index 79d6022cc9f..6fc2fa483f4 100644
--- a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html
@@ -14,7 +14,8 @@
 <script>
 test_computed_value("offset-path", "none");
 
-test_computed_value("offset-path", "ray(0rad closest-side)", "ray(0deg closest-side)");
+test_computed_value("offset-path", "ray(0deg)");
+test_computed_value("offset-path", "ray(0rad closest-side)", "ray(0deg)");
 test_computed_value("offset-path", "ray(0.25turn closest-corner contain)", "ray(90deg closest-corner contain)");
 test_computed_value("offset-path", "ray(200grad farthest-side)", "ray(180deg farthest-side)");
 test_computed_value("offset-path", "ray(270deg farthest-corner contain)");
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html
index c69f7c81a9d..949e45d828f 100644
--- a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html
@@ -17,7 +17,6 @@
 test_invalid_value("offset-path", 'path("M 20 30 A 60 70 80")');
 
 test_invalid_value("offset-path", "ray(0 sides)");
-test_invalid_value("offset-path", "ray(0deg)");
 test_invalid_value("offset-path", "ray(closest-side)");
 test_invalid_value("offset-path", "ray(closest-side 0deg closest-side)");
 test_invalid_value("offset-path", "ray(0deg closest-side 0deg)");
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html
index fce99f572e9..db55250a6c7 100644
--- a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html
@@ -14,7 +14,8 @@
 <script>
 test_valid_value("offset-path", "none");
 
-test_valid_value("offset-path", "ray(0rad closest-side)");
+test_valid_value("offset-path", "ray(0deg)");
+test_valid_value("offset-path", "ray(0rad closest-side)", "ray(0rad)");
 test_valid_value("offset-path", "ray(0.25turn closest-corner contain)");
 test_valid_value("offset-path", "ray(200grad farthest-side)");
 test_valid_value("offset-path", "ray(270deg farthest-corner contain)");
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-shorthand.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-shorthand.html
index 611a394b8b1..5e38b8c459c 100644
--- a/tests/wpt/web-platform-tests/css/motion/parsing/offset-shorthand.html
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-shorthand.html
@@ -11,9 +11,9 @@
 </head>
 <body>
 <script>
-test_shorthand_value('offset', 'left bottom ray(0rad closest-side) 10px auto 30deg / right bottom', {
+test_shorthand_value('offset', 'left bottom ray(0rad closest-corner) 10px auto 30deg / right bottom', {
   'offset-position': 'left bottom',
-  'offset-path': 'ray(0rad closest-side)',
+  'offset-path': 'ray(0rad closest-corner)',
   'offset-distance': '10px',
   'offset-rotate': 'auto 30deg',
   'offset-anchor': 'right bottom',
diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html b/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html
new file mode 100644
index 00000000000..6ddc204b83a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom-ref.html
@@ -0,0 +1,452 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Selectors Invalidation: :nth-child(... of attribute) with a large DOM</title>
+<link rel="author" title="Bramus" href="https://www.bram.us/">
+<link rel="help" href="https://w3c.github.io/csswg-drafts/selectors-4/#child-index">
+<table border="1">
+  <thead>
+    <tr>
+      <th>#</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr hidden="hidden">
+      <td>1</td>
+    </tr>
+    <tr>
+      <td>2</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>4</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>5</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>6</td>
+    </tr>
+    <tr>
+      <td>7</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>8</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>9</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>10</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>11</td>
+    </tr>
+    <tr>
+      <td>12</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>13</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>14</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>15</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>16</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>17</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>18</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>19</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>20</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>21</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>22</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>23</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>24</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>25</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>26</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>27</td>
+    </tr>
+    <tr>
+      <td>28</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>29</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>30</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>31</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>32</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>33</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>34</td>
+    </tr>
+    <tr>
+      <td>35</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>36</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>37</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>38</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>39</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>40</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>41</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>42</td>
+    </tr>
+    <tr>
+      <td>43</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>44</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>45</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>46</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>47</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>48</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>49</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>50</td>
+    </tr>
+    <tr>
+      <td>51</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>52</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>53</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>54</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>55</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>56</td>
+    </tr>
+    <tr>
+      <td>57</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>58</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>59</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>60</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>61</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>62</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>63</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>64</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>65</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>66</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>67</td>
+    </tr>
+    <tr>
+      <td>68</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>69</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>70</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>71</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>72</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>73</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>74</td>
+    </tr>
+    <tr>
+      <td>75</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>76</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>77</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>78</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>79</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>80</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>81</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>82</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>83</td>
+    </tr>
+    <tr>
+      <td>84</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>85</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>86</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>87</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>88</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>89</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>90</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>91</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>92</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>93</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>94</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>95</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>96</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>97</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>98</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>99</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>100</td>
+    </tr>
+    <tr>
+      <td>101</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>102</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>103</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>104</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>105</td>
+    </tr>
+    <tr>
+      <td>106</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>107</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>108</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>109</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>110</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>111</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>112</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>113</td>
+    </tr>
+    <tr>
+      <td>114</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>115</td>
+    </tr>
+    <tr>
+      <td>116</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>117</td>
+    </tr>
+    <tr>
+      <td>118</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>119</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>120</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>121</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>122</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>123</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>124</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>125</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>126</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>127</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>128</td>
+    </tr>
+    <tr>
+      <td>129</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>130</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>131</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>132</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>133</td>
+    </tr>
+    <tr>
+      <td>134</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>135</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>136</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>137</td>
+    </tr>
+    <tr>
+      <td>138</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>139</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>140</td>
+    </tr>
+    <tr style="background: lightgrey;">
+      <td>141</td>
+    </tr>
+    <tr>
+      <td>142</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>143</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>144</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>145</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>146</td>
+    </tr>
+  </tbody>
+</table>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom.html b/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom.html
new file mode 100644
index 00000000000..76bc4542dae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/selectors/invalidation/nth-child-of-attr-largedom.html
@@ -0,0 +1,462 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>CSS Selectors Invalidation: :nth-child(... of attribute) with a large DOM</title>
+<link rel="author" title="Bramus" href="https://www.bram.us/">
+<link rel="match" href="nth-child-of-attr-largedom-ref.html">
+<link rel="help" href="https://w3c.github.io/csswg-drafts/selectors-4/#child-index">
+<style>
+  tr:nth-child(even of :not([hidden])){
+    background: lightgrey;
+  }
+</style>
+<table border="1">
+  <thead>
+    <tr>
+      <th>#</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr hidden="hidden">
+      <td>1</td>
+    </tr>
+    <tr>
+      <td>2</td>
+    </tr>
+    <tr>
+      <td>3</td>
+    </tr>
+    <tr>
+      <td>4</td>
+    </tr>
+    <tr>
+      <td>5</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>6</td>
+    </tr>
+    <tr>
+      <td>7</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>8</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>9</td>
+    </tr>
+    <tr>
+      <td>10</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>11</td>
+    </tr>
+    <tr>
+      <td>12</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>13</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>14</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>15</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>16</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>17</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>18</td>
+    </tr>
+    <tr>
+      <td>19</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>20</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>21</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>22</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>23</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>24</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>25</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>26</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>27</td>
+    </tr>
+    <tr>
+      <td>28</td>
+    </tr>
+    <tr>
+      <td>29</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>30</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>31</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>32</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>33</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>34</td>
+    </tr>
+    <tr>
+      <td>35</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>36</td>
+    </tr>
+    <tr>
+      <td>37</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>38</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>39</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>40</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>41</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>42</td>
+    </tr>
+    <tr>
+      <td>43</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>44</td>
+    </tr>
+    <tr>
+      <td>45</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>46</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>47</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>48</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>49</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>50</td>
+    </tr>
+    <tr>
+      <td>51</td>
+    </tr>
+    <tr>
+      <td>52</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>53</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>54</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>55</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>56</td>
+    </tr>
+    <tr>
+      <td>57</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>58</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>59</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>60</td>
+    </tr>
+    <tr>
+      <td>61</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>62</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>63</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>64</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>65</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>66</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>67</td>
+    </tr>
+    <tr>
+      <td>68</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>69</td>
+    </tr>
+    <tr>
+      <td>70</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>71</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>72</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>73</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>74</td>
+    </tr>
+    <tr>
+      <td>75</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>76</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>77</td>
+    </tr>
+    <tr>
+      <td>78</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>79</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>80</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>81</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>82</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>83</td>
+    </tr>
+    <tr>
+      <td>84</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>85</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>86</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>87</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>88</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>89</td>
+    </tr>
+    <tr>
+      <td>90</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>91</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>92</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>93</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>94</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>95</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>96</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>97</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>98</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>99</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>100</td>
+    </tr>
+    <tr>
+      <td>101</td>
+    </tr>
+    <tr>
+      <td>102</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>103</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>104</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>105</td>
+    </tr>
+    <tr>
+      <td>106</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>107</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>108</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>109</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>110</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>111</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>112</td>
+    </tr>
+    <tr>
+      <td>113</td>
+    </tr>
+    <tr>
+      <td>114</td>
+    </tr>
+    <tr>
+      <td>115</td>
+    </tr>
+    <tr>
+      <td>116</td>
+    </tr>
+    <tr>
+      <td>117</td>
+    </tr>
+    <tr>
+      <td>118</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>119</td>
+    </tr>
+    <tr>
+      <td>120</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>121</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>122</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>123</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>124</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>125</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>126</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>127</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>128</td>
+    </tr>
+    <tr>
+      <td>129</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>130</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>131</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>132</td>
+    </tr>
+    <tr>
+      <td>133</td>
+    </tr>
+    <tr>
+      <td>134</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>135</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>136</td>
+    </tr>
+    <tr>
+      <td>137</td>
+    </tr>
+    <tr>
+      <td>138</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>139</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>140</td>
+    </tr>
+    <tr>
+      <td>141</td>
+    </tr>
+    <tr>
+      <td>142</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>143</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>144</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>145</td>
+    </tr>
+    <tr hidden="hidden">
+      <td>146</td>
+    </tr>
+  </tbody>
+</table>
+<script>
+  document.documentElement.offsetTop;
+  document.querySelectorAll(`tbody tr:not([data-affiliation=google-llc"])`).forEach($tr => $tr.setAttribute('hidden', 'hidden'));
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js b/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js
index aa8239ae928..283a2d8aaba 100644
--- a/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js
@@ -56,7 +56,7 @@
       target.style.setProperty(property, isNeutralKeyframe(from) ? '' : from);
     },
     nonInterpolationExpectations: function(from, to) {
-      return expectFlip(from, to, -Infinity);
+      return expectFlip(from, to, 0.5);
     },
     notAnimatableExpectations: function(from, to, underlying) {
       return expectFlip(from, to, -Infinity);
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testdriver.md b/tests/wpt/web-platform-tests/docs/writing-tests/testdriver.md
index 11193b147f0..24159e82cc8 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testdriver.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testdriver.md
@@ -87,6 +87,13 @@ the global scope.
 
 ```
 
+### Accessibility ###
+```eval_rst
+.. js:autofunction:: test_driver.get_computed_label
+.. js:autofunction:: test_driver.get_computed_role
+
+```
+
 ### Seure Payment Confirmation ###
 ```eval_rst
 .. js:autofunction:: test_driver.set_spc_transaction_mode
diff --git a/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html b/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html
new file mode 100644
index 00000000000..045cd0610ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/element/pixel-manipulation/2d.imageData.create2.round.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>Canvas test: 2d.imageData.create2.round</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<body class="show_output">
+
+<h1>2d.imageData.create2.round</h1>
+<p class="desc">createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)</p>
+
+
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+var t = async_test("createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)");
+_addTest(function(canvas, ctx) {
+
+var imgdata1 = ctx.createImageData(10.01, 10.99);
+var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
+_assertSame(imgdata1.width, imgdata2.width, "imgdata1.width", "imgdata2.width");
+_assertSame(imgdata1.height, imgdata2.height, "imgdata1.height", "imgdata2.height");
+
+
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html
index cd05d7b57b1..90825d29d24 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvas.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 var ctx2 = offscreenCanvas2.getContext('2d');
 ctx2.fillStyle = '#f00';
@@ -29,6 +30,7 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(canvas, 50,25, 2,253,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html
index 52a431cfaa1..15db07d6c1e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvascopy.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 var ctx2 = offscreenCanvas2.getContext('2d');
 ctx2.fillStyle = '#0f0';
@@ -30,6 +31,7 @@ ctx.globalCompositeOperation = 'copy'
 ctx.globalAlpha = 0.51;
 ctx.drawImage(offscreenCanvas2, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,130, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html
index 24d7a0fc3cd..f6ce643bc8a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.canvaspattern.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 var ctx2 = offscreenCanvas2.getContext('2d');
 ctx2.fillStyle = '#f00';
@@ -30,6 +31,7 @@ ctx.fillStyle = ctx.createPattern(offscreenCanvas2, 'no-repeat');
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(canvas, 50,25, 2,253,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html
index 6604d5647d3..3d6983f90ce 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.default.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertSame(ctx.globalAlpha, 1.0, "ctx.globalAlpha", "1.0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html
index e349b92376b..f2410facc07 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.fill.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixelApprox(canvas, 50,25, 2,253,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html
index 29a963a7c6f..32c690d9784 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.image.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.01; // avoid any potential alpha=0 optimisations
@@ -38,6 +39,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 2,253,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html
index 7eacf16c4fc..f057141895d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.imagepattern.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -39,6 +40,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 2,253,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html
index d00951e46e5..a4149ced9f2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.invalid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalAlpha = 0.5;
 var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
 ctx.globalAlpha = Infinity;
@@ -28,6 +29,7 @@ ctx.globalAlpha = -Infinity;
 _assertSame(ctx.globalAlpha, a, "ctx.globalAlpha", "a");
 ctx.globalAlpha = NaN;
 _assertSame(ctx.globalAlpha, a, "ctx.globalAlpha", "a");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html
index 29efb63aadf..05736827be7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.globalAlpha.range.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalAlpha = 0.5;
 var a = ctx.globalAlpha; // might not be exactly 0.5, if it is rounded/quantised, so remember for future comparisons
 ctx.globalAlpha = 1.1;
@@ -30,6 +31,7 @@ ctx.globalAlpha = 0;
 _assertSame(ctx.globalAlpha, 0, "ctx.globalAlpha", "0");
 ctx.globalAlpha = 1;
 _assertSame(ctx.globalAlpha, 1, "ctx.globalAlpha", "1");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html
index a317e7cf606..f70fad638c2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.casesensitive.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'Source-over';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html
index c838cf3f83a..0ffbc9eb2e6 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.clear.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'clear';
 _assertSame(ctx.globalCompositeOperation, 'clear', "ctx.globalCompositeOperation", "'clear'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html
index 1439cbbf41b..f4240b4e6e1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.darker.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'darker';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html
index f6a9d162cab..b18d17b585a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.default.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertSame(ctx.globalCompositeOperation, 'source-over', "ctx.globalCompositeOperation", "'source-over'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html
index 0b3226c279e..ff12aa593e2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.get.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var modes = ['source-atop', 'source-in', 'source-out', 'source-over',
     'destination-atop', 'destination-in', 'destination-out', 'destination-over',
     'lighter', 'copy', 'xor'];
@@ -28,6 +29,7 @@ for (var i = 0; i < modes.length; ++i)
     ctx.globalCompositeOperation = modes[i];
     _assertSame(ctx.globalCompositeOperation, modes[i], "ctx.globalCompositeOperation", "modes[\""+(i)+"\"]");
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html
index bffe7b4edbe..175d7184bad 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.highlight.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'highlight';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html
index 72e83fcf80c..6572003dc3b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.nullsuffix.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'source-over\0';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html
index 0400d974c41..950ca3d687b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.over.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'over';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html
index 1bcc764721d..31a4639056c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/compositing/2d.composite.operation.unrecognised.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'xor';
 ctx.globalCompositeOperation = 'nonexistent';
 _assertSame(ctx.globalCompositeOperation, 'xor', "ctx.globalCompositeOperation", "'xor'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html
index a89ec10f9b5..6846bd89477 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.basics.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertSame(ctx.save(), undefined, "ctx.save()", "undefined");
 _assertSame(ctx.restore(), undefined, "ctx.restore()", "undefined");
 _assertSame(ctx.scale(1, 1), undefined, "ctx.scale(1, 1)", "undefined");
@@ -56,6 +57,7 @@ if (ctx.putImageData) {
 }
 _assertSame(ctx.drawImage(canvas, 0, 0, 1, 1, 0, 0, 0, 0), undefined, "ctx.drawImage(canvas, 0, 0, 1, 1, 0, 0, 0, 0)", "undefined");
 _assertSame(ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white'), undefined, "ctx.createLinearGradient(0, 0, 0, 0).addColorStop(0, 'white')", "undefined");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html
index cfbbca9e5e2..e6930c0ac5f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/conformance-requirements/2d.conformance.requirements.missingargs.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.scale(); });
 assert_throws_js(TypeError, function() { ctx.scale(1); });
 assert_throws_js(TypeError, function() { ctx.rotate(); });
@@ -135,6 +136,7 @@ if (ctx.putImageData) {
 var g = ctx.createLinearGradient(0, 0, 0, 0);
 assert_throws_js(TypeError, function() { g.addColorStop(); });
 assert_throws_js(TypeError, function() { g.addColorStop(0); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html
index 8e144b1ba6b..a371d91431b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.3arg.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var promise1 = new Promise(function(resolve, reject) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", '/images/red.png');
@@ -54,6 +55,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
         _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html
index c383d1a4172..18ae25d829c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.5arg.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise1 = new Promise(function(resolve, reject) {
@@ -55,6 +56,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
         _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
index 72ffb4ee3b6..e7034126cf9 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -41,6 +42,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
index ddfa0cbf7cd..079a57ddbc1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise1 = new Promise(function(resolve, reject) {
@@ -56,6 +57,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
         _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
index d94daa861e0..1996227c352 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise1 = new Promise(function(resolve, reject) {
@@ -56,6 +57,7 @@ Promise.all([promise1, promise2]).then(function(response1, response2) {
         _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
index ffd60f5da94..ce6c758b3c8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -41,6 +42,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
index 91962b671b1..89acdb8e362 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -48,6 +49,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 80,30, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html
index 505c3fde5d1..eb8476f7c3a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.alpha.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0;
@@ -39,6 +40,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
index 59d79fd7174..ea4205abd44 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var promise = new Promise(function(resolve, reject) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", '/images/anim-poster-gr.png');
@@ -36,6 +37,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html
index 3324bebcbf9..37aae52a539 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.broken.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var promise = new Promise(function(resolve, reject) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", '/images/broken.png');
@@ -38,6 +39,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html
index 9b128710866..dc144cb6f9d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.canvas.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 var ctx2 = offscreenCanvas2.getContext('2d');
 ctx2.fillStyle = '#0f0';
@@ -31,6 +32,7 @@ _assertPixelApprox(canvas, 0,0, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 99,0, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 0,49, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html
index fa318521585..970cb4d5a5a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.clip.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.rect(-10, -10, 1, 1);
@@ -40,6 +41,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html
index de4ea40d7d7..90afbcbda8b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.composite.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.globalCompositeOperation = 'destination-over';
@@ -39,6 +40,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
index 5f729737827..c6a3fbcf005 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.floatsource.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var promise = new Promise(function(resolve, reject) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", '/images/green.png');
@@ -36,6 +37,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
index 5851fcfb03c..1c207673963 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedest.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -48,6 +49,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 75,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
index f9d820733d0..af274bf9bcd 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativedir.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -48,6 +49,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 75,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
index 9c2a2a1b103..5a7b2af7f2a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.negativesource.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -48,6 +49,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 75,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
index 54f8d952693..4a6a23b0fc3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -338,6 +339,7 @@ ctx.drawImage(bitmap, 0, 0, 100, 50, 0, 0, Infinity, Infinity);
         _assertPixel(canvas, 50,25, 0,255,0,255);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
index 6ec22c45d61..a45fa15daed 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.nowrap.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -40,6 +41,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 55,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html
index c32d836ce47..76c86b1b4af 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.null.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.drawImage(null, 0, 0); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html
index b6bad65df59..938c014c7ab 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.path.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.rect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -39,6 +40,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html
index 38857453a44..9e1777974c5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.1.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 50);
 ctx.fillStyle = '#f00';
@@ -30,6 +31,7 @@ _assertPixelApprox(canvas, 0,0, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 99,0, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 0,49, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html
index 74d383f7e38..f522d4822d3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.self.2.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 1, 100, 49);
 ctx.fillStyle = '#f00';
@@ -32,6 +33,7 @@ _assertPixelApprox(canvas, 0,0, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 99,0, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 0,49, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 99,49, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html
index d275bf95675..559eb9420e6 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.svg.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var promise = new Promise(function(resolve, reject) {
     var xhr = new XMLHttpRequest();
     xhr.open("GET", '/images/green.svg');
@@ -36,6 +37,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html
index 741c5efb9fa..e4d905474a4 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.transform.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.translate(100, 0);
@@ -39,6 +40,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
index 84cfaef1a73..5ea4234aa18 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.wrongtype.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.drawImage(undefined, 0, 0); });
 assert_throws_js(TypeError, function() { ctx.drawImage(0, 0, 0); });
 assert_throws_js(TypeError, function() { ctx.drawImage("", 0, 0); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
index 9d59ba70bc1..5cb758c2b9b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerocanvas.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var offscreenCanvas2 = new OffscreenCanvas(0, 10);
 assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2, 0, 0); });
 
@@ -31,6 +32,7 @@ assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanva
 offscreenCanvas2.width = 0;
 offscreenCanvas2.height = 0;
 assert_throws_dom("INVALID_STATE_ERR", function() { ctx.drawImage(offscreenCanvas2, 0, 0); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
index cc610399dbb..d91a1960608 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -40,6 +41,7 @@ promise.then(function(response) {
         _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
index d79f821d440..25cd54b57a0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html
@@ -16,11 +16,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 var promise = new Promise(function(resolve, reject) {
@@ -40,6 +41,7 @@ promise.then(function(response) {
         _assertPixel(canvas, 50,25, 0,255,0,255);
     }, t_fail);
 }).then(t_pass, t_fail);
+})(canvas, ctx);
 
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
index 846b264ee8c..6975dda5bcb 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.basic.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
index eb3de8b591f..4d67a5fadc6 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.clip.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.beginPath();
@@ -29,6 +30,7 @@ ctx.clearRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
index c1a3463d313..f5c0e52c02e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalalpha.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.globalAlpha = 0.1;
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
index a77f67a4ba4..f46245a6fd2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.globalcomposite.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.globalCompositeOperation = 'destination-atop';
 ctx.clearRect(0, 0, 100, 50);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
index 158294ab3ea..ff96d1f0782 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.negative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 50, 25);
@@ -30,6 +31,7 @@ _assertPixel(canvas, 25,12, 0,0,0,0);
 _assertPixel(canvas, 75,12, 0,0,0,0);
 _assertPixel(canvas, 25,37, 0,0,0,0);
 _assertPixel(canvas, 75,37, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
index 4d3037b26ba..24aa769bdd7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.nonfinite.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(Infinity, 0, 100, 50);
@@ -46,6 +47,7 @@ ctx.clearRect(0, Infinity, Infinity, Infinity);
 ctx.clearRect(0, Infinity, 100, Infinity);
 ctx.clearRect(0, 0, Infinity, Infinity);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
index ab813b1e9b8..e9716c9e594 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.path.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.beginPath();
 ctx.rect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 16, 16);
 ctx.fill();
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
index 050591d6203..904dfe9cd9d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.shadow.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.shadowColor = '#f00';
@@ -28,6 +29,7 @@ ctx.shadowOffsetX = 0;
 ctx.shadowOffsetY = 50;
 ctx.clearRect(0, -50, 100, 50);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
index cca3c4d32bd..a2ce63be0d7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.transform.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.scale(10, 10);
 ctx.translate(0, 5);
 ctx.clearRect(0, -5, 10, 5);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
index 69bbb5ecc7b..aaebbede940 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.clearRect.zero.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.clearRect(0, 0, 100, 0);
 ctx.clearRect(0, 0, 0, 50);
 ctx.clearRect(0, 0, 0, 0);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
index bad032bb7c7..6d8e6c62f74 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.basic.html
@@ -15,14 +15,16 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
index 7043c2355bc..5f38614713a 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.clip.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.beginPath();
@@ -30,6 +31,7 @@ ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
index 880e5700bd3..7e59325ff37 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.negative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
@@ -31,6 +32,7 @@ _assertPixel(canvas, 25,12, 0,255,0,255);
 _assertPixel(canvas, 75,12, 0,255,0,255);
 _assertPixel(canvas, 25,37, 0,255,0,255);
 _assertPixel(canvas, 75,37, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
index 0d545e9f3fa..e5b5be1344f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.nonfinite.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
@@ -47,6 +48,7 @@ ctx.fillRect(0, Infinity, Infinity, Infinity);
 ctx.fillRect(0, Infinity, 100, Infinity);
 ctx.fillRect(0, 0, Infinity, Infinity);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
index 13974b7e2ab..2f83eec2051 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.path.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.beginPath();
 ctx.rect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
@@ -27,6 +28,7 @@ ctx.fillRect(0, 0, 16, 16);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
index f3b015f25a7..f4dd0b2194b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.shadow.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.shadowColor = '#0f0';
@@ -28,6 +29,7 @@ ctx.shadowOffsetX = 0;
 ctx.shadowOffsetY = 50;
 ctx.fillRect(0, -50, 100, 50);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
index 081ac763bdf..900a5a720c4 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.transform.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.scale(10, 10);
 ctx.translate(0, 5);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, -5, 10, 5);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
index 3f015475d53..509b9b6eb49 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.fillRect.zero.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
@@ -27,6 +28,7 @@ ctx.fillRect(0, 0, 100, 0);
 ctx.fillRect(0, 0, 0, 50);
 ctx.fillRect(0, 0, 0, 0);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
index caee5d67354..581c3884206 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.basic.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
index 3aa5d0392eb..646be33af1b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.clip.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.beginPath();
@@ -31,6 +32,7 @@ ctx.strokeRect(0, 0, 100, 50);
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 16, 16);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
index a470939455b..a3e6af9b5cb 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalalpha.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalAlpha = 0;
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
index bfca74c48af..fb4b4a199e0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.globalCompositeOperation = 'source-in';
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(25, 24, 50, 2);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
index 04f33b184cd..3d34371f8a7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.negative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#0f0';
@@ -32,6 +33,7 @@ _assertPixel(canvas, 25,12, 0,255,0,255);
 _assertPixel(canvas, 75,12, 0,255,0,255);
 _assertPixel(canvas, 25,37, 0,255,0,255);
 _assertPixel(canvas, 75,37, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
index 1688912ab89..808522830ac 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.nonfinite.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 ctx.strokeStyle = '#f00';
@@ -48,6 +49,7 @@ ctx.strokeRect(0, Infinity, Infinity, Infinity);
 ctx.strokeRect(0, Infinity, 100, Infinity);
 ctx.strokeRect(0, 0, Infinity, Infinity);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
index c3d80bf299e..b7a99256572 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.path.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.beginPath();
 ctx.rect(0, 0, 100, 50);
 ctx.strokeStyle = '#f00';
@@ -28,6 +29,7 @@ ctx.strokeRect(0, 0, 16, 16);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
index e80d7511d43..769a6b19318 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.shadow.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#f00';
@@ -31,6 +32,7 @@ ctx.strokeStyle = '#f00';
 ctx.lineWidth = 50;
 ctx.strokeRect(0, -75, 100, 50);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
index 2b44d0c6272..08148a5cb27 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.transform.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.scale(10, 10);
 ctx.translate(0, 5);
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 5;
 ctx.strokeRect(2.5, -2.6, 5, 0.2);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
index fe4d77baaa9..52d0964ab38 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.1.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 250;
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
index 0e234f85e58..42b50187daf 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.2.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 250;
 ctx.lineCap = 'round';
 ctx.lineJoin = 'round';
 ctx.strokeRect(50, 25, 0, 0);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
index 0145b2e412c..b5e6bddb6fd 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.3.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 50;
 ctx.strokeRect(0, 25, 100, 0);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
index d0c284f8e09..a07d9370378 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.4.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = '#f00';
 ctx.lineWidth = 250;
 ctx.lineCap = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 _assertPixel(canvas, 50,25, 0,0,0,0);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
index 2441354c907..363c27d680d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/drawing-rectangles-to-the-canvas/2d.strokeRect.zero.5.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = '#0f0';
 ctx.lineWidth = 250;
 ctx.lineJoin = 'round';
 ctx.strokeRect(100, 25, 100, 0);
 _assertPixel(canvas, 50,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html
index bc476476e47..6ce6fb633f8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.blur.exceptions.tentative.html
@@ -15,17 +15,19 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur"}); });
 assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: undefined}); });
 assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: "foo"}); });
 assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: [1,2]}); });
 assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: NaN}); });
 assert_throws_js(TypeError, function() { ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: {}}); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html
index ece8a52216e..3eda41776c0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.colorMatrix.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: undefined}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: "foo"}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "colorMatrix", values: null}); });
@@ -63,6 +64,7 @@ _assertPixelApprox(canvas, 10,10, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 60,10, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 10,30, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 60,30, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html
index eaaa12f0a79..7cb8b0dd143 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.discrete.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement
 function getTransformedValue(C, V) {
     // Get the right interval
@@ -61,6 +62,7 @@ for (const color of inputColors) {
     ctx.fillRect(0, 0, 10, 10);
     _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, 2);
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html
index 6c5b04ab8a7..388fdca6f9d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.gamma.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement
 function getColor(inputColor, amplitude, exponent, offset) {
     return [
@@ -52,6 +53,7 @@ for (const color of inputColors) {
     ctx.fillRect(0, 0, 10, 10);
     _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, 2);
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html
index a6a7a3615a8..44eb7184956 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.identity.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.filter = new CanvasFilter({filter: "componentTransfer",
     funcR: {type: "identity"},
     funcG: {type: "identity"},
@@ -39,6 +40,7 @@ for (const color of inputColors) {
     ctx.fillRect(0, 0, 10, 10);
     _assertPixel(canvas, 5, 5, color[0],color[1],color[2],255);
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html
index f2218b7a1d5..d24a9e8608d 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.linear.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement
 function getColor(inputColor, slopes, intercepts) {
     return [
@@ -51,6 +52,7 @@ for (const color of inputColors) {
     ctx.fillRect(0, 0, 10, 10);
     _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, 2);
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html
index 9c4c16db851..a704557cc54 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.componentTransfer.table.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 // From https://www.w3.org/TR/SVG11/filters.html#feComponentTransferElement
 function getTransformedValue(C, V) {
     // Get the right interval
@@ -61,6 +62,7 @@ for (const color of inputColors) {
     ctx.fillRect(0, 0, 10, 10);
     _assertPixelApprox(canvas, 5, 5, outputColor[0],outputColor[1],outputColor[2],255, 2);
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html
index b44b074af1b..e5efa9cafc5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.convolveMatrix.exceptions.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix"}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", divisor: 2}); });
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: null}); });
@@ -31,6 +32,7 @@ assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatr
 assert_throws_js(TypeError, function() { new CanvasFilter({filter: "convolveMatrix", kernelMatrix: []}); });
 // This should not throw an error
 ctx.filter = new CanvasFilter({filter: "convolveMatrix", kernelMatrix: [[]]});
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html
index e4e06f27d24..75d369cad2f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assert(ctx.filter == 'none', "ctx.filter == 'none'");
 ctx.filter = 'blur(5px)';
 _assert(ctx.filter == 'blur(5px)', "ctx.filter == 'blur(5px)'");
@@ -41,6 +42,7 @@ _assert(ctx.filter == 'none', "ctx.filter == 'none'");
 ctx.filter = new CanvasFilter({filter: "gaussianBlur", stdDeviation: 5});
 ctx.filter = "this string is not a filter and should do nothing";
 _assert(ctx.filter.toString() == '[object CanvasFilter]', "ctx.filter.toString() == '[object CanvasFilter]'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html
index d5123476b5e..7882e95a694 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.canvasFilterObject.turbulence.inputTypes.tentative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 const errorTestCases = [
   {baseFrequency: {}},
   {baseFrequency: -1},
@@ -124,6 +125,7 @@ for (testCase of workingTestCases) {
   const filterOptions = {...{filter: "turbulence"}, ...testCase};
   _assert(new CanvasFilter(filterOptions) != null, "new CanvasFilter(filterOptions) != null");
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.html
index 8f06eb42fa0..2267c9aa811 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/filters/2d.filter.value.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assert(ctx.filter == 'none', "ctx.filter == 'none'");
 ctx.filter = 'blur(5px)';
 _assert(ctx.filter == 'blur(5px)', "ctx.filter == 'blur(5px)'");
@@ -50,6 +51,7 @@ _assert(ctx.filter == 'blur(5px)', "ctx.filter == 'blur(5px)'");
 
 ctx.filter = 'blur(  5px)';
 assert_equals(ctx.filter, 'blur(  5px)');
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html
index 717317de706..d5eb4cafb6b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.butt.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -55,6 +56,7 @@ _assertPixel(canvas, 75,16, 0,255,0,255);
 _assertPixel(canvas, 75,34, 0,255,0,255);
 _assertPixel(canvas, 75,35, 0,255,0,255);
 _assertPixel(canvas, 75,36, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html
index b6479be77e1..b26054fc162 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.closed.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.strokeStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
@@ -40,6 +41,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html
index b4598fdd85e..0570540ee39 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.invalid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.lineCap = 'butt'
 _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
 
@@ -46,6 +47,7 @@ _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
 ctx.lineCap = 'butt';
 ctx.lineCap = 'bevel';
 _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html
index 211ff760f66..54f904b4329 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.open.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.strokeStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
@@ -40,6 +41,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html
index 37a27b17bcd..788675310e6 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.round.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -71,6 +72,7 @@ _assertPixel(canvas, 82,6, 0,255,0,255);
 _assertPixel(canvas, 67,43, 0,255,0,255);
 _assertPixel(canvas, 75,43, 0,255,0,255);
 _assertPixel(canvas, 82,43, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html
index 75f9e44e21a..9d4a03ecad2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.square.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -55,6 +56,7 @@ _assertPixel(canvas, 75,6, 0,255,0,255);
 _assertPixel(canvas, 75,44, 0,255,0,255);
 _assertPixel(canvas, 75,45, 0,255,0,255);
 _assertPixel(canvas, 75,46, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html
index d4fcdfc0b5e..996afb37a57 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cap.valid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.lineCap = 'butt'
 _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
 
@@ -28,6 +29,7 @@ _assertSame(ctx.lineCap, 'round', "ctx.lineCap", "'round'");
 
 ctx.lineCap = 'square';
 _assertSame(ctx.lineCap, 'square', "ctx.lineCap", "'square'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.html
index 51fd1c40784..7c5821f2f56 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.cross.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -37,6 +38,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.html
index 64c21c563e0..e8a39c08237 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.defaults.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertSame(ctx.lineWidth, 1, "ctx.lineWidth", "1");
 _assertSame(ctx.lineCap, 'butt', "ctx.lineCap", "'butt'");
 _assertSame(ctx.lineJoin, 'miter', "ctx.lineJoin", "'miter'");
 _assertSame(ctx.miterLimit, 10, "ctx.miterLimit", "10");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html
index c1bb974dbf7..2554d714d92 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.invalid.strokestyle.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.strokeStyle = 'rgb(0, 255, 0)';
 ctx.strokeStyle = 'nonsense';
 ctx.lineWidth = 200;
@@ -31,6 +32,7 @@ var imgdata = imageData.data;
 _assert(imgdata[4] == 0, "imgdata[\""+(4)+"\"] == 0");
 _assert(imgdata[5] == 255, "imgdata[\""+(5)+"\"] == 255");
 _assert(imgdata[6] == 0, "imgdata[\""+(6)+"\"] == 0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html
index ecf83e7b5a0..b2325ad9891 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.bevel.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -74,6 +75,7 @@ _assertPixel(canvas, 84,15, 0,255,0,255);
 _assertPixel(canvas, 85,15, 0,255,0,255);
 _assertPixel(canvas, 86,15, 0,255,0,255);
 _assertPixel(canvas, 86,14, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html
index 7ce6599f4c1..a999e73d0a8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.closed.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.strokeStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
@@ -39,6 +40,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html
index 59d8b4311d8..f941c69e3dc 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.invalid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.lineJoin = 'bevel'
 _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
 
@@ -46,6 +47,7 @@ _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
 ctx.lineJoin = 'bevel';
 ctx.lineJoin = 'butt';
 _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html
index d28fb8b69f3..e31ef139fb1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.miter.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -65,6 +66,7 @@ _assertPixel(canvas, 89,11, 0,255,0,255);
 _assertPixel(canvas, 90,10, 0,255,0,255);
 _assertPixel(canvas, 91,9, 0,255,0,255);
 _assertPixel(canvas, 92,8, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.html
index 5bd8e48061c..b6a3901a9e4 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.open.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.strokeStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
@@ -39,6 +40,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html
index 928bb86f120..aaba8e44328 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.parallel.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -36,6 +37,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.html
index 9441585e50d..5f413373cb5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.round.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -72,6 +73,7 @@ _assertPixel(canvas, 86,13, 0,255,0,255);
 _assertPixel(canvas, 87,13, 0,255,0,255);
 _assertPixel(canvas, 88,13, 0,255,0,255);
 _assertPixel(canvas, 88,12, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html
index b3b15fc09d6..1ea992c7063 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.join.valid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.lineJoin = 'bevel'
 _assertSame(ctx.lineJoin, 'bevel', "ctx.lineJoin", "'bevel'");
 
@@ -28,6 +29,7 @@ _assertSame(ctx.lineJoin, 'round', "ctx.lineJoin", "'round'");
 
 ctx.lineJoin = 'miter';
 _assertSame(ctx.lineJoin, 'miter', "ctx.lineJoin", "'miter'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html
index 1713d8174ea..db8e4f84264 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.acute.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -46,6 +47,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html
index 172c63ca1ce..828af67835c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.exceeded.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -38,6 +39,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html
index 27251d4902a..42d5d927d76 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.invalid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.miterLimit = 1.5;
 _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
 
@@ -54,6 +55,7 @@ _assertSame(ctx.miterLimit, 1, "ctx.miterLimit", "1");
 ctx.miterLimit = 1.5;
 ctx.miterLimit = false;
 _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html
index 5ede60b8995..89f4c032554 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.lineedge.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -35,6 +36,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html
index 0eaeedfa419..69acc7e7bad 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.obtuse.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -46,6 +47,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html
index 7f8134f180f..980f8a74b8b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.rightangle.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -38,6 +39,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html
index 2702fc57a3c..1cf07cfbb3c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.valid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.miterLimit = 1.5;
 _assertSame(ctx.miterLimit, 1.5, "ctx.miterLimit", "1.5");
 
@@ -31,6 +32,7 @@ _assertSame(ctx.miterLimit, 1/1024, "ctx.miterLimit", "1/1024");
 
 ctx.miterLimit = 1000;
 _assertSame(ctx.miterLimit, 1000, "ctx.miterLimit", "1000");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html
index a9f7a366a38..150953cf766 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.miter.within.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -38,6 +39,7 @@ _assertPixel(canvas, 1,1, 0,255,0,255);
 _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.html
index 1f8b3a0d67c..69e42b7a8d3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.union.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -40,6 +41,7 @@ _assertPixel(canvas, 48,1, 0,255,0,255);
 _assertPixel(canvas, 1,48, 0,255,0,255);
 _assertPixel(canvas, 25,1, 0,255,0,255);
 _assertPixel(canvas, 48,48, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html
index 1d0e0298288..9b087ce8d34 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.basic.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -57,6 +58,7 @@ _assertPixel(canvas, 75,25, 0,255,0,255);
 _assertPixel(canvas, 84,25, 0,255,0,255);
 _assertPixel(canvas, 85,25, 0,255,0,255);
 _assertPixel(canvas, 86,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html
index 993dc17948f..0651b3f6a5e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.invalid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.lineWidth = 1.5;
 _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
 
@@ -54,6 +55,7 @@ _assertSame(ctx.lineWidth, 1, "ctx.lineWidth", "1");
 ctx.lineWidth = 1.5;
 ctx.lineWidth = false;
 _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html
index 091fd80c298..120360607f9 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.scaledefault.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -34,6 +35,7 @@ _assertPixel(canvas, 50,25, 0,255,0,255);
 _assertPixel(canvas, 75,25, 0,255,0,255);
 _assertPixel(canvas, 50,5, 0,255,0,255);
 _assertPixel(canvas, 50,45, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html
index c54943e462c..d2358ba2e84 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.transformed.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 
@@ -63,6 +64,7 @@ _assertPixel(canvas, 75,25, 0,255,0,255);
 _assertPixel(canvas, 84,25, 0,255,0,255);
 _assertPixel(canvas, 85,25, 0,255,0,255);
 _assertPixel(canvas, 86,25, 0,255,0,255);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html
index bdd86c6fbbf..4a4563c4e35 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/line-styles/2d.line.width.valid.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.lineWidth = 1.5;
 _assertSame(ctx.lineWidth, 1.5, "ctx.lineWidth", "1.5");
 
@@ -31,6 +32,7 @@ _assertSame(ctx.lineWidth, 1/1024, "ctx.lineWidth", "1/1024");
 
 ctx.lineWidth = 1000;
 _assertSame(ctx.lineWidth, 1000, "ctx.lineWidth", "1000");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html
index 24d9a774053..1f21ce6e32b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.basic.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertDifferent(ctx.createImageData(ctx.createImageData(1, 1)), null, "ctx.createImageData(ctx.createImageData(1, 1))", "null");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html
index 658ae83b560..6e9e02c77d0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.initial.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50);
 var imgdata1 = ctx.getImageData(0, 0, 10, 20);
@@ -32,6 +33,7 @@ for (var i = 0; i < imgdata2.data.length; ++i)
     if (imgdata2.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html
index 736725f0fd9..a4d074043f3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create1.zero.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.createImageData(null); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html
index 7dca77e4ae9..4e99cac955f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.basic.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertDifferent(ctx.createImageData(1, 1), null, "ctx.createImageData(1, 1)", "null");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html
new file mode 100644
index 00000000000..d927f28854d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.imageData.create2.double</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.create2.double</h1>
+<p class="desc">createImageData(w, h) double is converted to long</p>
+
+
+<script>
+var t = async_test("createImageData(w, h) double is converted to long");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(async function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+await (function(canvas, ctx) {
+var imgdata1 = ctx.createImageData(10.01, 10.99);
+var imgdata2 = ctx.createImageData(-10.01, -10.99);
+_assertSame(imgdata1.width, 10, "imgdata1.width", "10");
+_assertSame(imgdata1.height, 10, "imgdata1.height", "10");
+_assertSame(imgdata2.width, 10, "imgdata2.width", "10");
+_assertSame(imgdata2.height, 10, "imgdata2.height", "10");
+})(canvas, ctx);
+t.done();
+
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js
new file mode 100644
index 00000000000..773204cd418
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.double.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.create2.double
+// Description:createImageData(w, h) double is converted to long
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("createImageData(w, h) double is converted to long");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+var imgdata1 = ctx.createImageData(10.01, 10.99);
+var imgdata2 = ctx.createImageData(-10.01, -10.99);
+_assertSame(imgdata1.width, 10, "imgdata1.width", "10");
+_assertSame(imgdata1.height, 10, "imgdata1.height", "10");
+_assertSame(imgdata2.width, 10, "imgdata2.width", "10");
+_assertSame(imgdata2.height, 10, "imgdata2.height", "10");
+t.done();
+
+});
+done();
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html
index 76017f5c4f9..10029344246 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.initial.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.createImageData(10, 20);
 _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
 _assert(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
@@ -29,6 +30,7 @@ for (var i = 0; i < imgdata.data.length; ++i)
     if (imgdata.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html
index f3d19d3f291..e18893e9086 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.large.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.createImageData(1000, 2000);
 _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
 _assert(imgdata.width < imgdata.height, "imgdata.width < imgdata.height");
@@ -29,6 +30,7 @@ for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assum
     if (imgdata.data[i] !== 0)
         isTransparentBlack = false;
 _assert(isTransparentBlack, "isTransparentBlack");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html
index f4b4df99a8a..9272c9ed9c1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.negative.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata1 = ctx.createImageData(10, 20);
 var imgdata2 = ctx.createImageData(-10, 20);
 var imgdata3 = ctx.createImageData(10, -20);
@@ -27,6 +28,7 @@ var imgdata4 = ctx.createImageData(-10, -20);
 _assertSame(imgdata1.data.length, imgdata2.data.length, "imgdata1.data.length", "imgdata2.data.length");
 _assertSame(imgdata2.data.length, imgdata3.data.length, "imgdata2.data.length", "imgdata3.data.length");
 _assertSame(imgdata3.data.length, imgdata4.data.length, "imgdata3.data.length", "imgdata4.data.length");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html
index d7d1e7f7563..f51dd744210 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.html
@@ -8,18 +8,19 @@
 <h1>2d.imageData.create2.nonfinite</h1>
 <p class="desc">createImageData() throws TypeError if arguments are not finite</p>
 
-
+<p class="notes">Defined in "Web IDL" (draft)
 <script>
 var t = async_test("createImageData() throws TypeError if arguments are not finite");
 var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.createImageData(Infinity, 10); });
 assert_throws_js(TypeError, function() { ctx.createImageData(-Infinity, 10); });
 assert_throws_js(TypeError, function() { ctx.createImageData(NaN, 10); });
@@ -37,6 +38,7 @@ assert_throws_js(TypeError, function() { ctx.createImageData(10, posinfobj); });
 assert_throws_js(TypeError, function() { ctx.createImageData(10, neginfobj); });
 assert_throws_js(TypeError, function() { ctx.createImageData(10, nanobj); });
 assert_throws_js(TypeError, function() { ctx.createImageData(posinfobj, posinfobj); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
index f398e2a5d4f..ace0f64f94e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.nonfinite.worker.js
@@ -1,7 +1,7 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.imageData.create2.nonfinite
 // Description:createImageData() throws TypeError if arguments are not finite
-// Note:
+// Note:<p class="notes">Defined in "Web IDL" (draft)
 
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html
index f2f0aa89e25..046a04dbcca 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.round.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata1 = ctx.createImageData(10.01, 10.99);
 var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
 _assertSame(imgdata1.width, imgdata2.width, "imgdata1.width", "imgdata2.width");
 _assertSame(imgdata1.height, imgdata2.height, "imgdata1.height", "imgdata2.height");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html
index 7c3a2d94106..f109c7dc03f 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.html
@@ -15,14 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 0); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0.99, 10); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0.1); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js
index 615a989e68d..061e4ca1366 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.create2.zero.worker.js
@@ -19,6 +19,8 @@ var ctx = canvas.getContext('2d');
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 10); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0, 0); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(0.99, 10); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.createImageData(10, 0.1); });
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html
index d4f4a63b3a5..e9cc7e98018 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.basic.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 _assertDifferent(ctx.getImageData(0, 0, 100, 50), null, "ctx.getImageData(0, 0, 100, 50)", "null");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html
index 9cbc1b48dc3..f832c51c550 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.clamp.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = 'rgb(-100, -200, -300)';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = 'rgb(256, 300, 400)';
@@ -32,6 +33,7 @@ var imgdata2 = ctx.getImageData(30, 15, 1, 1);
 _assertSame(imgdata2.data[0], 255, "imgdata2.data[\""+(0)+"\"]", "255");
 _assertSame(imgdata2.data[1], 255, "imgdata2.data[\""+(1)+"\"]", "255");
 _assertSame(imgdata2.data[2], 255, "imgdata2.data[\""+(2)+"\"]", "255");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html
new file mode 100644
index 00000000000..6839632de70
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.imageData.get.double</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.get.double</h1>
+<p class="desc">createImageData(w, h) double is converted to long</p>
+
+
+<script>
+var t = async_test("createImageData(w, h) double is converted to long");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(async function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+await (function(canvas, ctx) {
+var imgdata1 = ctx.getImageData(0, 0, 10.01, 10.99);
+var imgdata2 = ctx.getImageData(0, 0, -10.01, -10.99);
+_assertSame(imgdata1.width, 10, "imgdata1.width", "10");
+_assertSame(imgdata1.height, 10, "imgdata1.height", "10");
+_assertSame(imgdata2.width, 10, "imgdata2.width", "10");
+_assertSame(imgdata2.height, 10, "imgdata2.height", "10");
+})(canvas, ctx);
+t.done();
+
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js
new file mode 100644
index 00000000000..e05fe1009cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.double.worker.js
@@ -0,0 +1,28 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.get.double
+// Description:createImageData(w, h) double is converted to long
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("createImageData(w, h) double is converted to long");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+var imgdata1 = ctx.getImageData(0, 0, 10.01, 10.99);
+var imgdata2 = ctx.getImageData(0, 0, -10.01, -10.99);
+_assertSame(imgdata1.width, 10, "imgdata1.width", "10");
+_assertSame(imgdata1.height, 10, "imgdata1.height", "10");
+_assertSame(imgdata2.width, 10, "imgdata2.width", "10");
+_assertSame(imgdata2.height, 10, "imgdata2.height", "10");
+t.done();
+
+});
+done();
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html
new file mode 100644
index 00000000000..df63bd2e2a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.imageData.get.invalid</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.get.invalid</h1>
+<p class="desc">Verify getImageData() behavior in invalid cases.</p>
+
+
+<script>
+var t = async_test("Verify getImageData() behavior in invalid cases.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(async function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+await (function(canvas, ctx) {
+imageData = ctx.getImageData(0,0,2,2);
+var testValues = [NaN, true, false, "\"garbage\"", "-1",
+                  "0", "1", "2", Infinity, -Infinity,
+                  -5, -0.5, 0, 0.5, 5,
+                  5.4, 255, 256, null, undefined];
+var testResults = [0, 1, 0, 0, 0,
+                   0, 1, 2, 255, 0,
+                   0, 0, 0, 0, 5,
+                   5, 255, 255, 0, 0];
+for (var i = 0; i < testValues.length; i++) {
+    imageData.data[0] = testValues[i];
+    _assert(imageData.data[0] == testResults[i], "imageData.data[\""+(0)+"\"] == testResults[\""+(i)+"\"]");
+}
+imageData.data['foo']='garbage';
+_assert(imageData.data['foo'] == 'garbage', "imageData.data['foo'] == 'garbage'");
+imageData.data[-1]='garbage';
+_assert(imageData.data[-1] == undefined, "imageData.data[-1] == undefined");
+imageData.data[17]='garbage';
+_assert(imageData.data[17] == undefined, "imageData.data[\""+(17)+"\"] == undefined");
+})(canvas, ctx);
+t.done();
+
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js
new file mode 100644
index 00000000000..c9798f59f63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.invalid.worker.js
@@ -0,0 +1,41 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.get.invalid
+// Description:Verify getImageData() behavior in invalid cases.
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("Verify getImageData() behavior in invalid cases.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+imageData = ctx.getImageData(0,0,2,2);
+var testValues = [NaN, true, false, "\"garbage\"", "-1",
+                  "0", "1", "2", Infinity, -Infinity,
+                  -5, -0.5, 0, 0.5, 5,
+                  5.4, 255, 256, null, undefined];
+var testResults = [0, 1, 0, 0, 0,
+                   0, 1, 2, 255, 0,
+                   0, 0, 0, 0, 5,
+                   5, 255, 255, 0, 0];
+for (var i = 0; i < testValues.length; i++) {
+    imageData.data[0] = testValues[i];
+    _assert(imageData.data[0] == testResults[i], "imageData.data[\""+(0)+"\"] == testResults[\""+(i)+"\"]");
+}
+imageData.data['foo']='garbage';
+_assert(imageData.data['foo'] == 'garbage', "imageData.data['foo'] == 'garbage'");
+imageData.data[-1]='garbage';
+_assert(imageData.data[-1] == undefined, "imageData.data[-1] == undefined");
+imageData.data[17]='garbage';
+_assert(imageData.data[17] == undefined, "imageData.data[\""+(17)+"\"] == undefined");
+t.done();
+
+});
+done();
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html
new file mode 100644
index 00000000000..5e6102d67d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.imageData.get.large.crash</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.get.large.crash</h1>
+<p class="desc">Test that canvas crash when image data cannot be allocated.</p>
+
+
+<script>
+var t = async_test("Test that canvas crash when image data cannot be allocated.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(async function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+await (function(canvas, ctx) {
+assert_throws_js(TypeError, function() { ctx.getImageData(10, 0xffffffff, 2147483647, 10); });
+})(canvas, ctx);
+t.done();
+
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js
new file mode 100644
index 00000000000..142c0b833d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.large.crash.worker.js
@@ -0,0 +1,23 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.get.large.crash
+// Description:Test that canvas crash when image data cannot be allocated.
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("Test that canvas crash when image data cannot be allocated.");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+assert_throws_js(TypeError, function() { ctx.getImageData(10, 0xffffffff, 2147483647, 10); });
+t.done();
+
+});
+done();
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html
index 2f7247fafcd..19fbac06535 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.length.html
@@ -15,13 +15,15 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 _assertSame(imgdata.data.length, imgdata.width*imgdata.height*4, "imgdata.data.length", "imgdata.width*imgdata.height*4");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html
index 5efc73663da..b9324865b6b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.html
@@ -8,18 +8,19 @@
 <h1>2d.imageData.get.nonfinite</h1>
 <p class="desc">getImageData() throws TypeError if arguments are not finite</p>
 
-
+<p class="notes">Defined in "Web IDL" (draft)
 <script>
 var t = async_test("getImageData() throws TypeError if arguments are not finite");
 var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.getImageData(Infinity, 10, 10, 10); });
 assert_throws_js(TypeError, function() { ctx.getImageData(-Infinity, 10, 10, 10); });
 assert_throws_js(TypeError, function() { ctx.getImageData(NaN, 10, 10, 10); });
@@ -69,6 +70,7 @@ assert_throws_js(TypeError, function() { ctx.getImageData(10, posinfobj, posinfo
 assert_throws_js(TypeError, function() { ctx.getImageData(10, posinfobj, posinfobj, posinfobj); });
 assert_throws_js(TypeError, function() { ctx.getImageData(10, posinfobj, 10, posinfobj); });
 assert_throws_js(TypeError, function() { ctx.getImageData(10, 10, posinfobj, posinfobj); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
index 15b3950adc4..da70d1b2138 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonfinite.worker.js
@@ -1,7 +1,7 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.imageData.get.nonfinite
 // Description:getImageData() throws TypeError if arguments are not finite
-// Note:
+// Note:<p class="notes">Defined in "Web IDL" (draft)
 
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html
index bed3294be46..89eea879318 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.nonpremul.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = 'rgba(255, 255, 255, 0.5)';
 ctx.fillRect(0, 0, 100, 50);
 var imgdata = ctx.getImageData(10, 10, 10, 10);
@@ -28,6 +29,7 @@ _assert(imgdata.data[1] > 200, "imgdata.data[\""+(1)+"\"] > 200");
 _assert(imgdata.data[2] > 200, "imgdata.data[\""+(2)+"\"] > 200");
 _assert(imgdata.data[3] > 100, "imgdata.data[\""+(3)+"\"] > 100");
 _assert(imgdata.data[3] < 200, "imgdata.data[\""+(3)+"\"] < 200");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html
index a169cb59e30..f79f5f351e0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.alpha.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = 'rgba(0, 0, 0, 0.5)';
 ctx.fillRect(0, 0, 100, 50);
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 _assert(imgdata.data[3] < 200, "imgdata.data[\""+(3)+"\"] < 200");
 _assert(imgdata.data[3] > 100, "imgdata.data[\""+(3)+"\"] > 100");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html
index 09eb58a7fdf..9afceba7023 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.cols.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#fff';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#000';
@@ -28,6 +29,7 @@ var imgdata = ctx.getImageData(0, 0, 10, 10);
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata.data[Math.round(imgdata.width/2*4)], 255, "imgdata.data[Math.round(imgdata.width/2*4)]", "255");
 _assertSame(imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)], 0, "imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html
index b56adf19fe0..0fd4759409e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rgb.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#48c';
 ctx.fillRect(0, 0, 100, 50);
 var imgdata = ctx.getImageData(0, 0, 10, 10);
@@ -31,6 +32,7 @@ _assertSame(imgdata.data[4], 0x44, "imgdata.data[\""+(4)+"\"]", "0x44");
 _assertSame(imgdata.data[5], 0x88, "imgdata.data[\""+(5)+"\"]", "0x88");
 _assertSame(imgdata.data[6], 0xCC, "imgdata.data[\""+(6)+"\"]", "0xCC");
 _assertSame(imgdata.data[7], 255, "imgdata.data[\""+(7)+"\"]", "255");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html
index 3ad1ced7d22..eb7a137ab19 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.order.rows.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#fff';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#000';
@@ -28,6 +29,7 @@ var imgdata = ctx.getImageData(0, 0, 10, 10);
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata.data[Math.floor(imgdata.width/2*4)], 0, "imgdata.data[Math.floor(imgdata.width/2*4)]", "0");
 _assertSame(imgdata.data[(imgdata.height/2)*imgdata.width*4], 255, "imgdata.data[(imgdata.height/2)*imgdata.width*4]", "255");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html
index 283dd07b4cb..91c0c5844a5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.range.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#000';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#fff';
@@ -28,6 +29,7 @@ var imgdata1 = ctx.getImageData(10, 5, 1, 1);
 _assertSame(imgdata1.data[0], 0, "imgdata1.data[\""+(0)+"\"]", "0");
 var imgdata2 = ctx.getImageData(30, 15, 1, 1);
 _assertSame(imgdata2.data[0], 255, "imgdata2.data[\""+(0)+"\"]", "255");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html
new file mode 100644
index 00000000000..a06d180a575
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<title>OffscreenCanvas test: 2d.imageData.get.rounding</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.imageData.get.rounding</h1>
+<p class="desc">Test the handling of non-integer source coordinates in getImageData().</p>
+
+
+<script>
+var t = async_test("Test the handling of non-integer source coordinates in getImageData().");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(async function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+await (function(canvas, ctx) {
+function testDimensions(sx, sy, sw, sh, width, height)
+{
+    imageData = ctx.getImageData(sx, sy, sw, sh);
+    _assert(imageData.width == width, "imageData.width == width");
+    _assert(imageData.height == height, "imageData.height == height");
+}
+
+testDimensions(0, 0, 20, 10, 20, 10);
+
+testDimensions(.1, .2, 20, 10, 20, 10);
+testDimensions(.9, .8, 20, 10, 20, 10);
+
+testDimensions(0, 0, 20.9, 10.9, 20, 10);
+testDimensions(0, 0, 20.1, 10.1, 20, 10);
+
+testDimensions(-1, -1, 20, 10, 20, 10);
+
+testDimensions(-1.1, 0, 20, 10, 20, 10);
+testDimensions(-1.9,  0, 20, 10, 20, 10);
+})(canvas, ctx);
+t.done();
+
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js
new file mode 100644
index 00000000000..8cdbf790f9d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.rounding.worker.js
@@ -0,0 +1,41 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.imageData.get.rounding
+// Description:Test the handling of non-integer source coordinates in getImageData().
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+var t = async_test("Test the handling of non-integer source coordinates in getImageData().");
+var t_pass = t.done.bind(t);
+var t_fail = t.step_func(function(reason) {
+    throw reason;
+});
+t.step(function() {
+
+var canvas = new OffscreenCanvas(100, 50);
+var ctx = canvas.getContext('2d');
+
+function testDimensions(sx, sy, sw, sh, width, height)
+{
+    imageData = ctx.getImageData(sx, sy, sw, sh);
+    _assert(imageData.width == width, "imageData.width == width");
+    _assert(imageData.height == height, "imageData.height == height");
+}
+
+testDimensions(0, 0, 20, 10, 20, 10);
+
+testDimensions(.1, .2, 20, 10, 20, 10);
+testDimensions(.9, .8, 20, 10, 20, 10);
+
+testDimensions(0, 0, 20.9, 10.9, 20, 10);
+testDimensions(0, 0, 20.1, 10.1, 20, 10);
+
+testDimensions(-1, -1, 20, 10, 20, 10);
+
+testDimensions(-1.1, 0, 20, 10, 20, 10);
+testDimensions(-1.9,  0, 20, 10, 20, 10);
+t.done();
+
+});
+done();
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html
index a7e3d8574f9..7e9d36338d7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#000';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#fff';
 ctx.fillRect(20, 10, 60, 10);
+
 var imgdata1 = ctx.getImageData(85, 25, -10, -10);
 _assertSame(imgdata1.data[0], 255, "imgdata1.data[\""+(0)+"\"]", "255");
 _assertSame(imgdata1.data[1], 255, "imgdata1.data[\""+(1)+"\"]", "255");
@@ -33,11 +35,13 @@ _assertSame(imgdata1.data[imgdata1.data.length-4+0], 0, "imgdata1.data[imgdata1.
 _assertSame(imgdata1.data[imgdata1.data.length-4+1], 0, "imgdata1.data[imgdata1.data.length-4+1]", "0");
 _assertSame(imgdata1.data[imgdata1.data.length-4+2], 0, "imgdata1.data[imgdata1.data.length-4+2]", "0");
 _assertSame(imgdata1.data[imgdata1.data.length-4+3], 255, "imgdata1.data[imgdata1.data.length-4+3]", "255");
+
 var imgdata2 = ctx.getImageData(0, 0, -1, -1);
 _assertSame(imgdata2.data[0], 0, "imgdata2.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata2.data[1], 0, "imgdata2.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata2.data[2], 0, "imgdata2.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata2.data[3], 0, "imgdata2.data[\""+(3)+"\"]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js
index e057315d57c..989178792a0 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.negative.worker.js
@@ -20,6 +20,7 @@ ctx.fillStyle = '#000';
 ctx.fillRect(0, 0, 100, 50);
 ctx.fillStyle = '#fff';
 ctx.fillRect(20, 10, 60, 10);
+
 var imgdata1 = ctx.getImageData(85, 25, -10, -10);
 _assertSame(imgdata1.data[0], 255, "imgdata1.data[\""+(0)+"\"]", "255");
 _assertSame(imgdata1.data[1], 255, "imgdata1.data[\""+(1)+"\"]", "255");
@@ -29,6 +30,7 @@ _assertSame(imgdata1.data[imgdata1.data.length-4+0], 0, "imgdata1.data[imgdata1.
 _assertSame(imgdata1.data[imgdata1.data.length-4+1], 0, "imgdata1.data[imgdata1.data.length-4+1]", "0");
 _assertSame(imgdata1.data[imgdata1.data.length-4+2], 0, "imgdata1.data[imgdata1.data.length-4+2]", "0");
 _assertSame(imgdata1.data[imgdata1.data.length-4+3], 255, "imgdata1.data[imgdata1.data.length-4+3]", "255");
+
 var imgdata2 = ctx.getImageData(0, 0, -1, -1);
 _assertSame(imgdata2.data[0], 0, "imgdata2.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata2.data[1], 0, "imgdata2.data[\""+(1)+"\"]", "0");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html
index a071e44d557..7dbe2dd1b34 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.html
@@ -15,43 +15,51 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#08f';
 ctx.fillRect(0, 0, 100, 50);
+
 var imgdata1 = ctx.getImageData(-10, 5, 1, 1);
 _assertSame(imgdata1.data[0], 0, "imgdata1.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata1.data[1], 0, "imgdata1.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata1.data[2], 0, "imgdata1.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata1.data[3], 0, "imgdata1.data[\""+(3)+"\"]", "0");
+
 var imgdata2 = ctx.getImageData(10, -5, 1, 1);
 _assertSame(imgdata2.data[0], 0, "imgdata2.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata2.data[1], 0, "imgdata2.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata2.data[2], 0, "imgdata2.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata2.data[3], 0, "imgdata2.data[\""+(3)+"\"]", "0");
+
 var imgdata3 = ctx.getImageData(200, 5, 1, 1);
 _assertSame(imgdata3.data[0], 0, "imgdata3.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata3.data[1], 0, "imgdata3.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata3.data[2], 0, "imgdata3.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata3.data[3], 0, "imgdata3.data[\""+(3)+"\"]", "0");
+
 var imgdata4 = ctx.getImageData(10, 60, 1, 1);
 _assertSame(imgdata4.data[0], 0, "imgdata4.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata4.data[1], 0, "imgdata4.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata4.data[2], 0, "imgdata4.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata4.data[3], 0, "imgdata4.data[\""+(3)+"\"]", "0");
+
 var imgdata5 = ctx.getImageData(100, 10, 1, 1);
 _assertSame(imgdata5.data[0], 0, "imgdata5.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata5.data[1], 0, "imgdata5.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata5.data[2], 0, "imgdata5.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata5.data[3], 0, "imgdata5.data[\""+(3)+"\"]", "0");
+
 var imgdata6 = ctx.getImageData(0, 10, 1, 1);
 _assertSame(imgdata6.data[0], 0, "imgdata6.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata6.data[1], 136, "imgdata6.data[\""+(1)+"\"]", "136");
 _assertSame(imgdata6.data[2], 255, "imgdata6.data[\""+(2)+"\"]", "255");
 _assertSame(imgdata6.data[3], 255, "imgdata6.data[\""+(3)+"\"]", "255");
+
 var imgdata7 = ctx.getImageData(-10, 10, 20, 20);
 _assertSame(imgdata7.data[ 0*4+0], 0, "imgdata7.data[ 0*4+0]", "0");
 _assertSame(imgdata7.data[ 0*4+1], 0, "imgdata7.data[ 0*4+1]", "0");
@@ -73,6 +81,7 @@ _assertSame(imgdata7.data[20*4+0], 0, "imgdata7.data[20*4+0]", "0");
 _assertSame(imgdata7.data[20*4+1], 0, "imgdata7.data[20*4+1]", "0");
 _assertSame(imgdata7.data[20*4+2], 0, "imgdata7.data[20*4+2]", "0");
 _assertSame(imgdata7.data[20*4+3], 0, "imgdata7.data[20*4+3]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js
index 4025ecd4be9..eb7f355d683 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.outside.worker.js
@@ -18,36 +18,43 @@ var ctx = canvas.getContext('2d');
 
 ctx.fillStyle = '#08f';
 ctx.fillRect(0, 0, 100, 50);
+
 var imgdata1 = ctx.getImageData(-10, 5, 1, 1);
 _assertSame(imgdata1.data[0], 0, "imgdata1.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata1.data[1], 0, "imgdata1.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata1.data[2], 0, "imgdata1.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata1.data[3], 0, "imgdata1.data[\""+(3)+"\"]", "0");
+
 var imgdata2 = ctx.getImageData(10, -5, 1, 1);
 _assertSame(imgdata2.data[0], 0, "imgdata2.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata2.data[1], 0, "imgdata2.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata2.data[2], 0, "imgdata2.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata2.data[3], 0, "imgdata2.data[\""+(3)+"\"]", "0");
+
 var imgdata3 = ctx.getImageData(200, 5, 1, 1);
 _assertSame(imgdata3.data[0], 0, "imgdata3.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata3.data[1], 0, "imgdata3.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata3.data[2], 0, "imgdata3.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata3.data[3], 0, "imgdata3.data[\""+(3)+"\"]", "0");
+
 var imgdata4 = ctx.getImageData(10, 60, 1, 1);
 _assertSame(imgdata4.data[0], 0, "imgdata4.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata4.data[1], 0, "imgdata4.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata4.data[2], 0, "imgdata4.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata4.data[3], 0, "imgdata4.data[\""+(3)+"\"]", "0");
+
 var imgdata5 = ctx.getImageData(100, 10, 1, 1);
 _assertSame(imgdata5.data[0], 0, "imgdata5.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata5.data[1], 0, "imgdata5.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata5.data[2], 0, "imgdata5.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata5.data[3], 0, "imgdata5.data[\""+(3)+"\"]", "0");
+
 var imgdata6 = ctx.getImageData(0, 10, 1, 1);
 _assertSame(imgdata6.data[0], 0, "imgdata6.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata6.data[1], 136, "imgdata6.data[\""+(1)+"\"]", "136");
 _assertSame(imgdata6.data[2], 255, "imgdata6.data[\""+(2)+"\"]", "255");
 _assertSame(imgdata6.data[3], 255, "imgdata6.data[\""+(3)+"\"]", "255");
+
 var imgdata7 = ctx.getImageData(-10, 10, 20, 20);
 _assertSame(imgdata7.data[ 0*4+0], 0, "imgdata7.data[ 0*4+0]", "0");
 _assertSame(imgdata7.data[ 0*4+1], 0, "imgdata7.data[ 0*4+1]", "0");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html
index 4fd551db7db..8a8a71d9884 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.source.size.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata1 = ctx.getImageData(0, 0, 10, 10);
 var imgdata2 = ctx.getImageData(0, 0, 20, 20);
 _assert(imgdata2.width > imgdata1.width, "imgdata2.width > imgdata1.width");
 _assert(imgdata2.height > imgdata1.height, "imgdata2.height > imgdata1.height");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html
index f65f015e8f8..c096cc5be31 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.unaffected.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 50, 50)
 ctx.fillStyle = '#f00';
@@ -36,6 +37,7 @@ ctx.restore();
 ctx.putImageData(imgdata, 50, 0);
 _assertPixelApprox(canvas, 25,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 75,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html
index 91cf5a25e2b..9bad2b78439 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.html
@@ -15,14 +15,20 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 0); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0.1, 10); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0.99); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, -0.1, 10); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, -0.99); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js
index 07e8f3621b7..82f021ca8d4 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.get.zero.worker.js
@@ -19,6 +19,10 @@ var ctx = canvas.getContext('2d');
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 10); });
 assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0, 0); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 0.1, 10); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, 0.99); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, -0.1, 10); });
+assert_throws_dom("INDEX_SIZE_ERR", function() { ctx.getImageData(1, 1, 10, -0.99); });
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html
index 8b1515c678b..1bd6224892c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.html
@@ -15,36 +15,42 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
+
 imgdata.data[0] = 100;
 imgdata.data[0] = 300;
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
 imgdata.data[0] = 100;
 imgdata.data[0] = -100;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
 imgdata.data[0] = 100;
 imgdata.data[0] = 200+Math.pow(2, 32);
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
 imgdata.data[0] = 100;
 imgdata.data[0] = -200-Math.pow(2, 32);
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
 imgdata.data[0] = 100;
 imgdata.data[0] = Math.pow(10, 39);
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
 imgdata.data[0] = 100;
 imgdata.data[0] = -Math.pow(10, 39);
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
 imgdata.data[0] = 100;
 imgdata.data[0] = -Infinity;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
 imgdata.data[0] = 100;
 imgdata.data[0] = Infinity;
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js
index 0e2a33c75ef..0914c8fdc75 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.clamp.worker.js
@@ -17,24 +17,28 @@ var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
 var imgdata = ctx.getImageData(0, 0, 10, 10);
+
 imgdata.data[0] = 100;
 imgdata.data[0] = 300;
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
 imgdata.data[0] = 100;
 imgdata.data[0] = -100;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
 imgdata.data[0] = 100;
 imgdata.data[0] = 200+Math.pow(2, 32);
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
 imgdata.data[0] = 100;
 imgdata.data[0] = -200-Math.pow(2, 32);
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
 imgdata.data[0] = 100;
 imgdata.data[0] = Math.pow(10, 39);
 _assertSame(imgdata.data[0], 255, "imgdata.data[\""+(0)+"\"]", "255");
 imgdata.data[0] = 100;
 imgdata.data[0] = -Math.pow(10, 39);
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+
 imgdata.data[0] = 100;
 imgdata.data[0] = -Infinity;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html
index 9fce409778d..9910af8e2af 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.nan.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 imgdata.data[0] = 100;
 imgdata.data[0] = NaN;
@@ -27,6 +28,7 @@ _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
 imgdata.data[0] = 100;
 imgdata.data[0] = "cheese";
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
index 05a4106b6ba..13dd3695328 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.properties.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 _assertSame(typeof(imgdata.width), 'number', "typeof(imgdata.width)", "'number'");
 _assertSame(typeof(imgdata.height), 'number', "typeof(imgdata.height)", "'number'");
 _assertSame(typeof(imgdata.data), 'object', "typeof(imgdata.data)", "'object'");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html
index 5fbdfc5ce08..a141786fec8 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.readonly.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 var w = imgdata.width;
 var h = imgdata.height;
@@ -34,6 +35,7 @@ _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
 _assertSame(imgdata.data[1], 0, "imgdata.data[\""+(1)+"\"]", "0");
 _assertSame(imgdata.data[2], 0, "imgdata.data[\""+(2)+"\"]", "0");
 _assertSame(imgdata.data[3], 0, "imgdata.data[\""+(3)+"\"]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html
index 8b362a01c67..306ccb8df44 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.round.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 imgdata.data[0] = 0.499;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
@@ -49,6 +50,7 @@ imgdata.data[0] = -0.5;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
 imgdata.data[0] = -1.5;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html
index 95305c5bc45..a5808b77772 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.set.html
@@ -15,16 +15,18 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 imgdata.data[0] = 100;
 _assertSame(imgdata.data[0], 100, "imgdata.data[\""+(0)+"\"]", "100");
 imgdata.data[0] = 200;
 _assertSame(imgdata.data[0], 200, "imgdata.data[\""+(0)+"\"]", "200");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html
index a7b5d578d2b..5245f3a6757 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.string.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 imgdata.data[0] = 100;
 imgdata.data[0] = "110";
@@ -30,6 +31,7 @@ _assertSame(imgdata.data[0], 120, "imgdata.data[\""+(0)+"\"]", "120");
 imgdata.data[0] = 100;
 imgdata.data[0] = " +130e0 ";
 _assertSame(imgdata.data[0], 130, "imgdata.data[\""+(0)+"\"]", "130");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html
index a2533a52e6d..3290c579bb3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.object.undefined.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 imgdata.data[0] = 100;
 imgdata.data[0] = undefined;
 _assertSame(imgdata.data[0], 0, "imgdata.data[\""+(0)+"\"]", "0");
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html
index ecda85bd121..4e64e4207e2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = 'rgba(0, 255, 0, 0.25)';
 ctx.fillRect(0, 0, 100, 50)
 var imgdata = ctx.getImageData(0, 0, 100, 50);
@@ -27,6 +28,7 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,64, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..5428c65524eebf083e2772bd66b496eeb1c1745e
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^DL`z*!3HE(nbz$CQfx`y?k)`fL2$v|<&%LTlRRA<
zLn`LHz33>&peS%)!_z4b?~Cm5XRKA>vbt=V{%yj?y?hVOPmpj<;^{P0IYxWNGbS@t
W#>EqF|N0Dc9fPN<pUXO@geCxL7D>(k

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html
index d140cc39ab4..76f143ad6ae 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.basic.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 var imgdata = ctx.getImageData(0, 0, 100, 50);
@@ -27,6 +28,7 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html
index 121a45fae8a..fef4c2c1a88 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.clip.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 var imgdata = ctx.getImageData(0, 0, 100, 50);
@@ -31,6 +32,7 @@ ctx.clip();
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(canvas, 25,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 75,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html
index 7ade3b1debe..d936c02d418 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.created.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.createImageData(100, 50);
 for (var i = 0; i < imgdata.data.length; i += 4) {
     imgdata.data[i] = 0;
@@ -31,6 +32,7 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html
index af90d71991e..e00f9bd0db5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.cross.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var offscreenCanvas2 = new OffscreenCanvas(100, 50);
 var ctx2 = offscreenCanvas2.getContext('2d');
 ctx2.fillStyle = '#0f0';
@@ -29,6 +30,7 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html
index e2fbcb27028..7493abc0cbb 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.html
@@ -15,26 +15,31 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 20, 20)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
 ctx.fillRect(40, 20, 20, 20)
 ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 35,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 65,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 50,15, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 50,45, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
index 5eec264c756..f228813f321 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.negative.worker.js
@@ -20,12 +20,15 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 20, 20)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
 ctx.fillRect(40, 20, 20, 20)
 ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 35,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 65,25, 0,255,0,255, 2);
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html
index aaf48a762bc..3aa731d7fb3 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.html
@@ -15,20 +15,25 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
+
 ctx.putImageData(imgdata, 100, 20, 20, 20, -20, -20);
 ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50);
 ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20);
 ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 98,15, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 98,25, 0,255,0,255, 2);
@@ -36,6 +41,7 @@ _assertPixelApprox(canvas, 98,45, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 1,5, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 1,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 1,45, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
index 9f537135dac..d1993a44803 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.outside.worker.js
@@ -18,13 +18,17 @@ var ctx = canvas.getContext('2d');
 
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
+
 ctx.putImageData(imgdata, 100, 20, 20, 20, -20, -20);
 ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50);
 ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20);
 ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 98,15, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 98,25, 0,255,0,255, 2);
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html
index e973eb6ca4b..17a14cfe9e1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.html
@@ -15,26 +15,31 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 20, 20)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
 ctx.fillRect(40, 20, 20, 20)
 ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 35,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 65,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 50,15, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 50,45, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
index fdbe6561ce5..d694e2ef435 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect1.worker.js
@@ -20,12 +20,15 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 20, 20)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
 ctx.fillRect(40, 20, 20, 20)
 ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 35,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 65,25, 0,255,0,255, 2);
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html
index 9b275429e6e..df1f6fe0392 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.html
@@ -15,26 +15,31 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#0f0';
 ctx.fillRect(60, 30, 20, 20)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
 ctx.fillRect(40, 20, 20, 20)
 ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 35,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 65,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 50,15, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 50,45, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
index 3578ceec25a..6652b1a9307 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.rect2.worker.js
@@ -20,12 +20,15 @@ ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#0f0';
 ctx.fillRect(60, 30, 20, 20)
+
 var imgdata = ctx.getImageData(0, 0, 100, 50);
+
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
 ctx.fillRect(40, 20, 20, 20)
 ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20);
+
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 35,25, 0,255,0,255, 2);
 _assertPixelApprox(canvas, 65,25, 0,255,0,255, 2);
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html
index c1b6735d259..2e6462895c4 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.dirty.zero.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 var imgdata = ctx.getImageData(0, 0, 100, 50);
@@ -27,6 +28,7 @@ ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html
index 543d9ff2930..04f64600cd6 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.modified.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 ctx.fillStyle = '#f00';
@@ -32,6 +33,7 @@ for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
 }
 ctx.putImageData(imgdata, 45, 20);
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html
index 6590f761adf..c8f322c2f03 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.html
@@ -8,18 +8,19 @@
 <h1>2d.imageData.put.nonfinite</h1>
 <p class="desc">putImageData() throws TypeError if arguments are not finite</p>
 
-
+<p class="notes">Defined in "Web IDL" (draft)
 <script>
 var t = async_test("putImageData() throws TypeError if arguments are not finite");
 var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = ctx.getImageData(0, 0, 10, 10);
 assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, Infinity, 10); });
 assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, -Infinity, 10); });
@@ -103,6 +104,7 @@ assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 10, 10, 10, I
 assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 10, 10, 10, Infinity, Infinity, Infinity); });
 assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 10, 10, 10, Infinity, 10, Infinity); });
 assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 10, 10, 10, 10, Infinity, Infinity); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
index 04298fa99fa..c63d66f0dc7 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.nonfinite.worker.js
@@ -1,7 +1,7 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
 // OffscreenCanvas test in a worker:2d.imageData.put.nonfinite
 // Description:putImageData() throws TypeError if arguments are not finite
-// Note:
+// Note:<p class="notes">Defined in "Web IDL" (draft)
 
 importScripts("/resources/testharness.js");
 importScripts("/html/canvas/resources/canvas-tests.js");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html
index 3a51c9719cf..82eb5c28b66 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.null.html
@@ -15,12 +15,14 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 assert_throws_js(TypeError, function() { ctx.putImageData(null, 0, 0); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html
index 53e3ac4fcee..8d63a4287d2 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.path.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#f00';
 ctx.fillRect(0, 0, 100, 50)
 ctx.rect(0, 0, 100, 50);
@@ -28,6 +29,7 @@ ctx.putImageData(imgdata, 0, 0);
 ctx.fillStyle = '#0f0';
 ctx.fill();
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html
index 8d94f9bbf63..048818fdba5 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unaffected.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 ctx.fillStyle = '#0f0';
 ctx.fillRect(0, 0, 100, 50)
 var imgdata = ctx.getImageData(0, 0, 100, 50);
@@ -33,6 +34,7 @@ ctx.translate(100, 50);
 ctx.scale(0.1, 0.1);
 ctx.putImageData(imgdata, 0, 0);
 _assertPixelApprox(canvas, 50,25, 0,255,0,255, 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html
index b3aff6f49c2..cab36f19e1e 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var i = 0;
 for (var y = 0; y < 16; ++y) {
     for (var x = 0; x < 16; ++x, ++i) {
@@ -31,11 +32,14 @@ var imgdata1 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
 var olddata = [];
 for (var i = 0; i < imgdata1.data.length; ++i)
     olddata[i] = imgdata1.data[i];
+
 ctx.putImageData(imgdata1, 0.1, 0.2);
+
 var imgdata2 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
 for (var i = 0; i < imgdata2.data.length; ++i) {
     _assertSame(olddata[i], imgdata2.data[i], "olddata[\""+(i)+"\"]", "imgdata2.data[\""+(i)+"\"]");
 }
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js
index 231ba3860da..07f4362f43c 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.unchanged.worker.js
@@ -27,7 +27,9 @@ var imgdata1 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
 var olddata = [];
 for (var i = 0; i < imgdata1.data.length; ++i)
     olddata[i] = imgdata1.data[i];
+
 ctx.putImageData(imgdata1, 0.1, 0.2);
+
 var imgdata2 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
 for (var i = 0; i < imgdata2.data.length; ++i) {
     _assertSame(olddata[i], imgdata2.data[i], "olddata[\""+(i)+"\"]", "imgdata2.data[\""+(i)+"\"]");
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html
index 8e8ca53a9a4..d726d5f9684 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/pixel-manipulation/2d.imageData.put.wrongtype.html
@@ -15,15 +15,17 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d');
 
+await (function(canvas, ctx) {
 var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
 assert_throws_js(TypeError, function() { ctx.putImageData(imgdata, 0, 0); });
 assert_throws_js(TypeError, function() { ctx.putImageData("cheese", 0, 0); });
 assert_throws_js(TypeError, function() { ctx.putImageData(42, 0, 0); });
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html
index fd8385bbf72..d307dbe96d9 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.p3.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d', {colorSpace: "display-p3"});
 
+await (function(canvas, ctx) {
 var color_style = 'rgb(50, 100, 150)';
 // [0.24304, 0.38818, 0.57227, 1.0] * 255 = [62, 99, 146, 255]
 var pixel_expected = [62, 99, 146, 255];
@@ -33,6 +34,7 @@ assert_approx_equals(pixel[0], pixel_expected[0], 2);
 assert_approx_equals(pixel[1], pixel_expected[1], 2);
 assert_approx_equals(pixel[2], pixel_expected[2], 2);
 assert_approx_equals(pixel[3], pixel_expected[3], 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
index 56d771b6664..8427a752b09 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/wide-gamut-canvas/2d.color.space.p3.to.srgb.html
@@ -15,11 +15,12 @@ var t_pass = t.done.bind(t);
 var t_fail = t.step_func(function(reason) {
     throw reason;
 });
-t.step(function() {
+t.step(async function() {
 
 var canvas = new OffscreenCanvas(100, 50);
 var ctx = canvas.getContext('2d', {colorSpace: "display-p3"});
 
+await (function(canvas, ctx) {
 var color_style = 'rgb(50, 100, 150)';
 var pixel_expected = [50, 100, 150, 255];
 var epsilon = 2;
@@ -32,6 +33,7 @@ assert_approx_equals(pixel[0], pixel_expected[0], 2);
 assert_approx_equals(pixel[1], pixel_expected[1], 2);
 assert_approx_equals(pixel[2], pixel_expected[2], 2);
 assert_approx_equals(pixel[3], pixel_expected[3], 2);
+})(canvas, ctx);
 t.done();
 
 });
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/templates-new.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/templates-new.yaml
index eaaf6efac88..0a2de9f0b43 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/templates-new.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/templates-new.yaml
@@ -16,12 +16,14 @@ offscreen: |
     var t_fail = t.step_func(function(reason) {
         throw reason;
     });
-    t.step(function() {
+    t.step(async function() {
 
     var canvas = new OffscreenCanvas(%(width)s, %(height)s);
     var ctx = canvas.getContext(%(context_args)s);
 
+    await (function(canvas, ctx) {
     %(code)s
+    })(canvas, ctx);
     t.done();
 
     });
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/pixel-manipulation.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml
similarity index 96%
rename from tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/pixel-manipulation.yaml
rename to tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml
index eca8e8b2bda..0ae664d2307 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/element/pixel-manipulation.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/yaml-new/pixel-manipulation.yaml
@@ -11,6 +11,7 @@
 - name: 2d.imageData.create2.type
   desc: createImageData(sw, sh) returns an ImageData object containing a Uint8ClampedArray
     object
+  canvasType: ['HTMLCanvas']
   code: |
     @assert window.ImageData !== undefined;
     @assert window.Uint8ClampedArray !== undefined;
@@ -23,6 +24,7 @@
 - name: 2d.imageData.create1.type
   desc: createImageData(imgdata) returns an ImageData object containing a Uint8ClampedArray
     object
+  canvasType: ['HTMLCanvas']
   code: |
     @assert window.ImageData !== undefined;
     @assert window.Uint8ClampedArray !== undefined;
@@ -34,6 +36,7 @@
 
 - name: 2d.imageData.create2.this
   desc: createImageData(sw, sh) should throw when called with the wrong |this|
+  canvasType: ['HTMLCanvas']
   notes: &bindings Defined in "Web IDL" (draft)
   code: |
     @assert throws TypeError CanvasRenderingContext2D.prototype.createImageData.call(null, 1, 1); @moz-todo
@@ -42,6 +45,7 @@
 
 - name: 2d.imageData.create1.this
   desc: createImageData(imgdata) should throw when called with the wrong |this|
+  canvasType: ['HTMLCanvas']
   notes: *bindings
   code: |
     var imgdata = ctx.createImageData(1, 1);
@@ -136,8 +140,27 @@
     @assert imgdata2.width === 10;
     @assert imgdata2.height === 10;
 
+- name: 2d.imageData.get.double
+  desc: createImageData(w, h) double is converted to long
+  code: |
+    var imgdata1 = ctx.getImageData(0, 0, 10.01, 10.99);
+    var imgdata2 = ctx.getImageData(0, 0, -10.01, -10.99);
+    @assert imgdata1.width === 10;
+    @assert imgdata1.height === 10;
+    @assert imgdata2.width === 10;
+    @assert imgdata2.height === 10;
+
+- name: 2d.imageData.create2.round
+  desc: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)
+  code: |
+    var imgdata1 = ctx.createImageData(10.01, 10.99);
+    var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
+    @assert imgdata1.width === imgdata2.width;
+    @assert imgdata1.height === imgdata2.height;
+
 - name: 2d.imageData.create.and.resize
   desc: Verify no crash when resizing an image bitmap to zero.
+  canvasType: ['HTMLCanvas']
   images:
   - red.png
   code: |
@@ -156,6 +179,7 @@
     @assert ctx.getImageData(0, 0, 100, 50) !== null;
 
 - name: 2d.imageData.get.type
+  canvasType: ['HTMLCanvas']
   desc: getImageData() returns an ImageData object containing a Uint8ClampedArray
     object
   code: |
@@ -285,16 +309,6 @@
     @assert imgdata2.width > imgdata1.width;
     @assert imgdata2.height > imgdata1.height;
 
-- name: 2d.imageData.get.double
-  desc: createImageData(w, h) double is converted to long
-  code: |
-    var imgdata1 = ctx.getImageData(0, 0, 10.01, 10.99);
-    var imgdata2 = ctx.getImageData(0, 0, -10.01, -10.99);
-    @assert imgdata1.width === 10;
-    @assert imgdata1.height === 10;
-    @assert imgdata2.width === 10;
-    @assert imgdata2.height === 10;
-
 - name: 2d.imageData.get.nonpremul
   desc: getImageData() returns non-premultiplied colors
   code: |
@@ -410,7 +424,6 @@
     @assert pixel 75,25 ==~ 0,255,0,255;
   expected: green
 
-
 - name: 2d.imageData.get.large.crash
   desc: Test that canvas crash when image data cannot be allocated.
   code: |
@@ -489,6 +502,7 @@
     @assert imgdata.data[3] === 0;
 
 - name: 2d.imageData.object.ctor.size
+  canvasType: ['HTMLCanvas']
   desc: ImageData has a usable constructor
   code: |
     @assert window.ImageData !== undefined;
@@ -502,6 +516,7 @@
     }
 
 - name: 2d.imageData.object.ctor.basics
+  canvasType: ['HTMLCanvas']
   desc: Testing different type of ImageData constructor
   code: |
     function setRGBA(imageData, i, rgba)
@@ -592,6 +607,7 @@
 
 - name: 2d.imageData.object.ctor.array
   desc: ImageData has a usable constructor
+  canvasType: ['HTMLCanvas']
   code: |
     @assert window.ImageData !== undefined;
 
@@ -603,6 +619,7 @@
 
 - name: 2d.imageData.object.ctor.array.bounds
   desc: ImageData has a usable constructor
+  canvasType: ['HTMLCanvas']
   code: |
     @assert window.ImageData !== undefined;
 
@@ -785,6 +802,7 @@
 
 - name: 2d.imageData.put.cross
   desc: putImageData() accepts image data got from a different canvas
+  canvasType: ['HTMLCanvas']
   code: |
     var canvas2 = document.createElement('canvas');
     var ctx2 = canvas2.getContext('2d');
@@ -797,6 +815,21 @@
     @assert pixel 50,25 ==~ 0,255,0,255;
   expected: green
 
+- name: 2d.imageData.put.cross
+  desc: putImageData() accepts image data got from a different canvas
+  canvasType: ['OffscreenCanvas']
+  code: |
+    var offscreenCanvas2 = new OffscreenCanvas(100, 50);
+    var ctx2 = offscreenCanvas2.getContext('2d');
+    ctx2.fillStyle = '#0f0';
+    ctx2.fillRect(0, 0, 100, 50)
+    var imgdata = ctx2.getImageData(0, 0, 100, 50);
+    ctx.fillStyle = '#f00';
+    ctx.fillRect(0, 0, 100, 50)
+    ctx.putImageData(imgdata, 0, 0);
+    @assert pixel 50,25 ==~ 0,255,0,255;
+  expected: green
+
 - name: 2d.imageData.put.alpha
   desc: putImageData() puts non-solid image data correctly
   code: |
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/pixel-manipulation.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/pixel-manipulation.yaml
deleted file mode 100644
index 86f7940adda..00000000000
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/pixel-manipulation.yaml
+++ /dev/null
@@ -1,735 +0,0 @@
-- name: 2d.imageData.create2.basic
-  desc: createImageData(sw, sh) exists and returns something
-  code: |
-    @assert ctx.createImageData(1, 1) !== null;
-    t.done();
-
-- name: 2d.imageData.create1.basic
-  desc: createImageData(imgdata) exists and returns something
-  code: |
-    @assert ctx.createImageData(ctx.createImageData(1, 1)) !== null;
-    t.done();
-
-- name: 2d.imageData.create2.initial
-  desc: createImageData(sw, sh) returns transparent black data of the right size
-  code: |
-    var imgdata = ctx.createImageData(10, 20);
-    @assert imgdata.data.length === imgdata.width*imgdata.height*4;
-    @assert imgdata.width < imgdata.height;
-    @assert imgdata.width > 0;
-    var isTransparentBlack = true;
-    for (var i = 0; i < imgdata.data.length; ++i)
-        if (imgdata.data[i] !== 0)
-            isTransparentBlack = false;
-    @assert isTransparentBlack;
-    t.done();
-
-- name: 2d.imageData.create1.initial
-  desc: createImageData(imgdata) returns transparent black data of the right size
-  code: |
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50);
-    var imgdata1 = ctx.getImageData(0, 0, 10, 20);
-    var imgdata2 = ctx.createImageData(imgdata1);
-    @assert imgdata2.data.length === imgdata1.data.length;
-    @assert imgdata2.width === imgdata1.width;
-    @assert imgdata2.height === imgdata1.height;
-    var isTransparentBlack = true;
-    for (var i = 0; i < imgdata2.data.length; ++i)
-        if (imgdata2.data[i] !== 0)
-            isTransparentBlack = false;
-    @assert isTransparentBlack;
-    t.done();
-
-- name: 2d.imageData.create2.large
-  desc: createImageData(sw, sh) works for sizes much larger than the canvas
-  code: |
-    var imgdata = ctx.createImageData(1000, 2000);
-    @assert imgdata.data.length === imgdata.width*imgdata.height*4;
-    @assert imgdata.width < imgdata.height;
-    @assert imgdata.width > 0;
-    var isTransparentBlack = true;
-    for (var i = 0; i < imgdata.data.length; i += 7813) // check ~1024 points (assuming normal scaling)
-        if (imgdata.data[i] !== 0)
-            isTransparentBlack = false;
-    @assert isTransparentBlack;
-    t.done();
-
-- name: 2d.imageData.create2.negative
-  desc: createImageData(sw, sh) takes the absolute magnitude of the size arguments
-  code: |
-    var imgdata1 = ctx.createImageData(10, 20);
-    var imgdata2 = ctx.createImageData(-10, 20);
-    var imgdata3 = ctx.createImageData(10, -20);
-    var imgdata4 = ctx.createImageData(-10, -20);
-    @assert imgdata1.data.length === imgdata2.data.length;
-    @assert imgdata2.data.length === imgdata3.data.length;
-    @assert imgdata3.data.length === imgdata4.data.length;
-    t.done();
-
-- name: 2d.imageData.create2.zero
-  desc: createImageData(sw, sh) throws INDEX_SIZE_ERR if size is zero
-  code: |
-    @assert throws INDEX_SIZE_ERR ctx.createImageData(10, 0);
-    @assert throws INDEX_SIZE_ERR ctx.createImageData(0, 10);
-    @assert throws INDEX_SIZE_ERR ctx.createImageData(0, 0);
-    t.done();
-
-- name: 2d.imageData.create2.nonfinite
-  desc: createImageData() throws TypeError if arguments are not finite
-  code: |
-    @nonfinite @assert throws TypeError ctx.createImageData(<10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>);
-    var posinfobj = { valueOf: function() { return Infinity; } },
-        neginfobj = { valueOf: function() { return -Infinity; } },
-        nanobj = { valueOf: function() { return -Infinity; } };
-    @nonfinite @assert throws TypeError ctx.createImageData(<10 posinfobj neginfobj nanobj>, <10 posinfobj neginfobj nanobj>);
-    t.done();
-
-- name: 2d.imageData.create1.zero
-  desc: createImageData(null) throws TypeError
-  code: |
-    @assert throws TypeError ctx.createImageData(null);
-    t.done();
-
-- name: 2d.imageData.create2.round
-  desc: createImageData(w, h) is rounded the same as getImageData(0, 0, w, h)
-  code: |
-    var imgdata1 = ctx.createImageData(10.01, 10.99);
-    var imgdata2 = ctx.getImageData(0, 0, 10.01, 10.99);
-    @assert imgdata1.width === imgdata2.width;
-    @assert imgdata1.height === imgdata2.height;
-    t.done();
-
-- name: 2d.imageData.get.basic
-  desc: getImageData() exists and returns something
-  code: |
-    @assert ctx.getImageData(0, 0, 100, 50) !== null;
-    t.done();
-
-- name: 2d.imageData.get.zero
-  desc: getImageData() throws INDEX_SIZE_ERR if size is zero
-  code: |
-    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 10, 0);
-    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 0, 10);
-    @assert throws INDEX_SIZE_ERR ctx.getImageData(1, 1, 0, 0);
-    t.done();
-
-- name: 2d.imageData.get.nonfinite
-  desc: getImageData() throws TypeError if arguments are not finite
-  code: |
-    @nonfinite @assert throws TypeError ctx.getImageData(<10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>);
-    var posinfobj = { valueOf: function() { return Infinity; } },
-        neginfobj = { valueOf: function() { return -Infinity; } },
-        nanobj = { valueOf: function() { return -Infinity; } };
-    @nonfinite @assert throws TypeError ctx.getImageData(<10 posinfobj neginfobj nanobj>, <10 posinfobj neginfobj nanobj>, <10 posinfobj neginfobj nanobj>, <10 posinfobj neginfobj nanobj>);
-    t.done();
-
-- name: 2d.imageData.get.source.outside
-  desc: getImageData() returns transparent black outside the canvas
-  code: |
-    ctx.fillStyle = '#08f';
-    ctx.fillRect(0, 0, 100, 50);
-    var imgdata1 = ctx.getImageData(-10, 5, 1, 1);
-    @assert imgdata1.data[0] === 0;
-    @assert imgdata1.data[1] === 0;
-    @assert imgdata1.data[2] === 0;
-    @assert imgdata1.data[3] === 0;
-    var imgdata2 = ctx.getImageData(10, -5, 1, 1);
-    @assert imgdata2.data[0] === 0;
-    @assert imgdata2.data[1] === 0;
-    @assert imgdata2.data[2] === 0;
-    @assert imgdata2.data[3] === 0;
-    var imgdata3 = ctx.getImageData(200, 5, 1, 1);
-    @assert imgdata3.data[0] === 0;
-    @assert imgdata3.data[1] === 0;
-    @assert imgdata3.data[2] === 0;
-    @assert imgdata3.data[3] === 0;
-    var imgdata4 = ctx.getImageData(10, 60, 1, 1);
-    @assert imgdata4.data[0] === 0;
-    @assert imgdata4.data[1] === 0;
-    @assert imgdata4.data[2] === 0;
-    @assert imgdata4.data[3] === 0;
-    var imgdata5 = ctx.getImageData(100, 10, 1, 1);
-    @assert imgdata5.data[0] === 0;
-    @assert imgdata5.data[1] === 0;
-    @assert imgdata5.data[2] === 0;
-    @assert imgdata5.data[3] === 0;
-    var imgdata6 = ctx.getImageData(0, 10, 1, 1);
-    @assert imgdata6.data[0] === 0;
-    @assert imgdata6.data[1] === 136;
-    @assert imgdata6.data[2] === 255;
-    @assert imgdata6.data[3] === 255;
-    var imgdata7 = ctx.getImageData(-10, 10, 20, 20);
-    @assert imgdata7.data[ 0*4+0] === 0;
-    @assert imgdata7.data[ 0*4+1] === 0;
-    @assert imgdata7.data[ 0*4+2] === 0;
-    @assert imgdata7.data[ 0*4+3] === 0;
-    @assert imgdata7.data[ 9*4+0] === 0;
-    @assert imgdata7.data[ 9*4+1] === 0;
-    @assert imgdata7.data[ 9*4+2] === 0;
-    @assert imgdata7.data[ 9*4+3] === 0;
-    @assert imgdata7.data[10*4+0] === 0;
-    @assert imgdata7.data[10*4+1] === 136;
-    @assert imgdata7.data[10*4+2] === 255;
-    @assert imgdata7.data[10*4+3] === 255;
-    @assert imgdata7.data[19*4+0] === 0;
-    @assert imgdata7.data[19*4+1] === 136;
-    @assert imgdata7.data[19*4+2] === 255;
-    @assert imgdata7.data[19*4+3] === 255;
-    @assert imgdata7.data[20*4+0] === 0;
-    @assert imgdata7.data[20*4+1] === 0;
-    @assert imgdata7.data[20*4+2] === 0;
-    @assert imgdata7.data[20*4+3] === 0;
-    t.done();
-
-- name: 2d.imageData.get.source.negative
-  desc: getImageData() works with negative width and height, and returns top-to-bottom
-    left-to-right
-  code: |
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#fff';
-    ctx.fillRect(20, 10, 60, 10);
-    var imgdata1 = ctx.getImageData(85, 25, -10, -10);
-    @assert imgdata1.data[0] === 255;
-    @assert imgdata1.data[1] === 255;
-    @assert imgdata1.data[2] === 255;
-    @assert imgdata1.data[3] === 255;
-    @assert imgdata1.data[imgdata1.data.length-4+0] === 0;
-    @assert imgdata1.data[imgdata1.data.length-4+1] === 0;
-    @assert imgdata1.data[imgdata1.data.length-4+2] === 0;
-    @assert imgdata1.data[imgdata1.data.length-4+3] === 255;
-    var imgdata2 = ctx.getImageData(0, 0, -1, -1);
-    @assert imgdata2.data[0] === 0;
-    @assert imgdata2.data[1] === 0;
-    @assert imgdata2.data[2] === 0;
-    @assert imgdata2.data[3] === 0;
-    t.done();
-
-- name: 2d.imageData.get.source.size
-  desc: getImageData() returns bigger ImageData for bigger source rectangle
-  code: |
-    var imgdata1 = ctx.getImageData(0, 0, 10, 10);
-    var imgdata2 = ctx.getImageData(0, 0, 20, 20);
-    @assert imgdata2.width > imgdata1.width;
-    @assert imgdata2.height > imgdata1.height;
-    t.done();
-
-- name: 2d.imageData.get.nonpremul
-  desc: getImageData() returns non-premultiplied colors
-  code: |
-    ctx.fillStyle = 'rgba(255, 255, 255, 0.5)';
-    ctx.fillRect(0, 0, 100, 50);
-    var imgdata = ctx.getImageData(10, 10, 10, 10);
-    @assert imgdata.data[0] > 200;
-    @assert imgdata.data[1] > 200;
-    @assert imgdata.data[2] > 200;
-    @assert imgdata.data[3] > 100;
-    @assert imgdata.data[3] < 200;
-    t.done();
-
-- name: 2d.imageData.get.range
-  desc: getImageData() returns values in the range [0, 255]
-  code: |
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#fff';
-    ctx.fillRect(20, 10, 60, 10);
-    var imgdata1 = ctx.getImageData(10, 5, 1, 1);
-    @assert imgdata1.data[0] === 0;
-    var imgdata2 = ctx.getImageData(30, 15, 1, 1);
-    @assert imgdata2.data[0] === 255;
-    t.done();
-
-- name: 2d.imageData.get.clamp
-  desc: getImageData() clamps colors to the range [0, 255]
-  code: |
-    ctx.fillStyle = 'rgb(-100, -200, -300)';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = 'rgb(256, 300, 400)';
-    ctx.fillRect(20, 10, 60, 10);
-    var imgdata1 = ctx.getImageData(10, 5, 1, 1);
-    @assert imgdata1.data[0] === 0;
-    @assert imgdata1.data[1] === 0;
-    @assert imgdata1.data[2] === 0;
-    var imgdata2 = ctx.getImageData(30, 15, 1, 1);
-    @assert imgdata2.data[0] === 255;
-    @assert imgdata2.data[1] === 255;
-    @assert imgdata2.data[2] === 255;
-    t.done();
-
-- name: 2d.imageData.get.length
-  desc: getImageData() returns a correctly-sized Uint8ClampedArray
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @assert imgdata.data.length === imgdata.width*imgdata.height*4;
-    t.done();
-
-- name: 2d.imageData.get.order.cols
-  desc: getImageData() returns leftmost columns first
-  code: |
-    ctx.fillStyle = '#fff';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, 2, 50);
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @assert imgdata.data[0] === 0;
-    @assert imgdata.data[Math.round(imgdata.width/2*4)] === 255;
-    @assert imgdata.data[Math.round((imgdata.height/2)*imgdata.width*4)] === 0;
-    t.done();
-
-- name: 2d.imageData.get.order.rows
-  desc: getImageData() returns topmost rows first
-  code: |
-    ctx.fillStyle = '#fff';
-    ctx.fillRect(0, 0, 100, 50);
-    ctx.fillStyle = '#000';
-    ctx.fillRect(0, 0, 100, 2);
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @assert imgdata.data[0] === 0;
-    @assert imgdata.data[Math.floor(imgdata.width/2*4)] === 0;
-    @assert imgdata.data[(imgdata.height/2)*imgdata.width*4] === 255;
-    t.done();
-
-- name: 2d.imageData.get.order.rgb
-  desc: getImageData() returns R then G then B
-  code: |
-    ctx.fillStyle = '#48c';
-    ctx.fillRect(0, 0, 100, 50);
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @assert imgdata.data[0] === 0x44;
-    @assert imgdata.data[1] === 0x88;
-    @assert imgdata.data[2] === 0xCC;
-    @assert imgdata.data[3] === 255;
-    @assert imgdata.data[4] === 0x44;
-    @assert imgdata.data[5] === 0x88;
-    @assert imgdata.data[6] === 0xCC;
-    @assert imgdata.data[7] === 255;
-    t.done();
-
-- name: 2d.imageData.get.order.alpha
-  desc: getImageData() returns A in the fourth component
-  code: |
-    ctx.fillStyle = 'rgba(0, 0, 0, 0.5)';
-    ctx.fillRect(0, 0, 100, 50);
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @assert imgdata.data[3] < 200;
-    @assert imgdata.data[3] > 100;
-    t.done();
-
-- name: 2d.imageData.get.unaffected
-  desc: getImageData() is not affected by context state
-  code: |
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 50, 50)
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(50, 0, 50, 50)
-    ctx.save();
-    ctx.translate(50, 0);
-    ctx.globalAlpha = 0.1;
-    ctx.globalCompositeOperation = 'destination-atop';
-    ctx.shadowColor = '#f00';
-    ctx.rect(0, 0, 5, 5);
-    ctx.clip();
-    var imgdata = ctx.getImageData(0, 0, 50, 50);
-    ctx.restore();
-    ctx.putImageData(imgdata, 50, 0);
-    @assert pixel 25,25 ==~ 0,255,0,255;
-    @assert pixel 75,25 ==~ 0,255,0,255;
-    t.done();
-
-
-- name: 2d.imageData.object.properties
-  desc: ImageData objects have the right properties
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @assert typeof(imgdata.width) === 'number';
-    @assert typeof(imgdata.height) === 'number';
-    @assert typeof(imgdata.data) === 'object';
-    t.done();
-
-- name: 2d.imageData.object.readonly
-  desc: ImageData objects properties are read-only
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    var w = imgdata.width;
-    var h = imgdata.height;
-    var d = imgdata.data;
-    imgdata.width = 123;
-    imgdata.height = 123;
-    imgdata.data = [100,100,100,100];
-    @assert imgdata.width === w;
-    @assert imgdata.height === h;
-    @assert imgdata.data === d;
-    @assert imgdata.data[0] === 0;
-    @assert imgdata.data[1] === 0;
-    @assert imgdata.data[2] === 0;
-    @assert imgdata.data[3] === 0;
-    t.done();
-
-- name: 2d.imageData.object.set
-  desc: ImageData.data can be modified
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    imgdata.data[0] = 100;
-    @assert imgdata.data[0] === 100;
-    imgdata.data[0] = 200;
-    @assert imgdata.data[0] === 200;
-    t.done();
-
-- name: 2d.imageData.object.undefined
-  desc: ImageData.data converts undefined to 0
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    imgdata.data[0] = 100;
-    imgdata.data[0] = undefined;
-    @assert imgdata.data[0] === 0;
-    t.done();
-
-- name: 2d.imageData.object.nan
-  desc: ImageData.data converts NaN to 0
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    imgdata.data[0] = 100;
-    imgdata.data[0] = NaN;
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = "cheese";
-    @assert imgdata.data[0] === 0;
-    t.done();
-
-- name: 2d.imageData.object.string
-  desc: ImageData.data converts strings to numbers with ToNumber
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    imgdata.data[0] = 100;
-    imgdata.data[0] = "110";
-    @assert imgdata.data[0] === 110;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = "0x78";
-    @assert imgdata.data[0] === 120;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = " +130e0 ";
-    @assert imgdata.data[0] === 130;
-    t.done();
-
-- name: 2d.imageData.object.clamp
-  desc: ImageData.data clamps numbers to [0, 255]
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    imgdata.data[0] = 100;
-    imgdata.data[0] = 300;
-    @assert imgdata.data[0] === 255;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = -100;
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = 200+Math.pow(2, 32);
-    @assert imgdata.data[0] === 255;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = -200-Math.pow(2, 32);
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = Math.pow(10, 39);
-    @assert imgdata.data[0] === 255;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = -Math.pow(10, 39);
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = -Infinity;
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 100;
-    imgdata.data[0] = Infinity;
-    @assert imgdata.data[0] === 255;
-    t.done();
-
-- name: 2d.imageData.object.round
-  desc: ImageData.data rounds numbers with round-to-zero
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    imgdata.data[0] = 0.499;
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 0.5;
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = 0.501;
-    @assert imgdata.data[0] === 1;
-    imgdata.data[0] = 1.499;
-    @assert imgdata.data[0] === 1;
-    imgdata.data[0] = 1.5;
-    @assert imgdata.data[0] === 2;
-    imgdata.data[0] = 1.501;
-    @assert imgdata.data[0] === 2;
-    imgdata.data[0] = 2.5;
-    @assert imgdata.data[0] === 2;
-    imgdata.data[0] = 3.5;
-    @assert imgdata.data[0] === 4;
-    imgdata.data[0] = 252.5;
-    @assert imgdata.data[0] === 252;
-    imgdata.data[0] = 253.5;
-    @assert imgdata.data[0] === 254;
-    imgdata.data[0] = 254.5;
-    @assert imgdata.data[0] === 254;
-    imgdata.data[0] = 256.5;
-    @assert imgdata.data[0] === 255;
-    imgdata.data[0] = -0.5;
-    @assert imgdata.data[0] === 0;
-    imgdata.data[0] = -1.5;
-    @assert imgdata.data[0] === 0;
-    t.done();
-
-- name: 2d.imageData.put.null
-  desc: putImageData() with null imagedata throws TypeError
-  code: |
-    @assert throws TypeError ctx.putImageData(null, 0, 0);
-    t.done();
-
-- name: 2d.imageData.put.nonfinite
-  desc: putImageData() throws TypeError if arguments are not finite
-  code: |
-    var imgdata = ctx.getImageData(0, 0, 10, 10);
-    @nonfinite @assert throws TypeError ctx.putImageData(<imgdata>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>);
-    @nonfinite @assert throws TypeError ctx.putImageData(<imgdata>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>, <10 Infinity -Infinity NaN>);
-    t.done();
-
-- name: 2d.imageData.put.basic
-  desc: putImageData() puts image data from getImageData() onto the canvas
-  code: |
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.putImageData(imgdata, 0, 0);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.created
-  desc: putImageData() puts image data from createImageData() onto the canvas
-  code: |
-    var imgdata = ctx.createImageData(100, 50);
-    for (var i = 0; i < imgdata.data.length; i += 4) {
-        imgdata.data[i] = 0;
-        imgdata.data[i+1] = 255;
-        imgdata.data[i+2] = 0;
-        imgdata.data[i+3] = 255;
-    }
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.putImageData(imgdata, 0, 0);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.wrongtype
-  desc: putImageData() does not accept non-ImageData objects
-  code: |
-    var imgdata = { width: 1, height: 1, data: [255, 0, 0, 255] };
-    @assert throws TypeError ctx.putImageData(imgdata, 0, 0);
-    @assert throws TypeError ctx.putImageData("cheese", 0, 0);
-    @assert throws TypeError ctx.putImageData(42, 0, 0);
-    t.done();
-
-- name: 2d.imageData.put.cross
-  desc: putImageData() accepts image data got from a different canvas
-  code: |
-    var offscreenCanvas2 = new OffscreenCanvas(100, 50);
-    var ctx2 = offscreenCanvas2.getContext('2d');
-    ctx2.fillStyle = '#0f0';
-    ctx2.fillRect(0, 0, 100, 50)
-    var imgdata = ctx2.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.putImageData(imgdata, 0, 0);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.alpha
-  desc: putImageData() puts non-solid image data correctly
-  code: |
-    ctx.fillStyle = 'rgba(0, 255, 0, 0.25)';
-    ctx.fillRect(0, 0, 100, 50)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.putImageData(imgdata, 0, 0);
-    @assert pixel 50,25 ==~ 0,255,0,64;
-    t.done();
-
-- name: 2d.imageData.put.modified
-  desc: putImageData() puts modified image data correctly
-  code: |
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(45, 20, 10, 10)
-    var imgdata = ctx.getImageData(45, 20, 10, 10);
-    for (var i = 0, len = imgdata.width*imgdata.height*4; i < len; i += 4)
-    {
-        imgdata.data[i] = 0;
-        imgdata.data[i+1] = 255;
-    }
-    ctx.putImageData(imgdata, 45, 20);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.dirty.zero
-  desc: putImageData() with zero-sized dirty rectangle puts nothing
-  code: |
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.putImageData(imgdata, 0, 0, 0, 0, 0, 0);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.dirty.rect1
-  desc: putImageData() only modifies areas inside the dirty rectangle, using width
-    and height
-  code: |
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 20, 20)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(40, 20, 20, 20)
-    ctx.putImageData(imgdata, 40, 20, 0, 0, 20, 20);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    @assert pixel 35,25 ==~ 0,255,0,255;
-    @assert pixel 65,25 ==~ 0,255,0,255;
-    @assert pixel 50,15 ==~ 0,255,0,255;
-    @assert pixel 50,45 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.dirty.rect2
-  desc: putImageData() only modifies areas inside the dirty rectangle, using x and
-    y
-  code: |
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(60, 30, 20, 20)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(40, 20, 20, 20)
-    ctx.putImageData(imgdata, -20, -10, 60, 30, 20, 20);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    @assert pixel 35,25 ==~ 0,255,0,255;
-    @assert pixel 65,25 ==~ 0,255,0,255;
-    @assert pixel 50,15 ==~ 0,255,0,255;
-    @assert pixel 50,45 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.dirty.negative
-  desc: putImageData() handles negative-sized dirty rectangles correctly
-  code: |
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 20, 20)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(40, 20, 20, 20)
-    ctx.putImageData(imgdata, 40, 20, 20, 20, -20, -20);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    @assert pixel 35,25 ==~ 0,255,0,255;
-    @assert pixel 65,25 ==~ 0,255,0,255;
-    @assert pixel 50,15 ==~ 0,255,0,255;
-    @assert pixel 50,45 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.dirty.outside
-  desc: putImageData() handles dirty rectangles outside the canvas correctly
-  code: |
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.putImageData(imgdata, 100, 20, 20, 20, -20, -20);
-    ctx.putImageData(imgdata, 200, 200, 0, 0, 100, 50);
-    ctx.putImageData(imgdata, 40, 20, -30, -20, 30, 20);
-    ctx.putImageData(imgdata, -30, 20, 0, 0, 30, 20);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    @assert pixel 98,15 ==~ 0,255,0,255;
-    @assert pixel 98,25 ==~ 0,255,0,255;
-    @assert pixel 98,45 ==~ 0,255,0,255;
-    @assert pixel 1,5 ==~ 0,255,0,255;
-    @assert pixel 1,25 ==~ 0,255,0,255;
-    @assert pixel 1,45 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.unchanged
-  desc: putImageData(getImageData(...), ...) has no effect
-  code: |
-    var i = 0;
-    for (var y = 0; y < 16; ++y) {
-        for (var x = 0; x < 16; ++x, ++i) {
-            ctx.fillStyle = 'rgba(' + i + ',' + (Math.floor(i*1.5) % 256) + ',' + (Math.floor(i*23.3) % 256) + ',' + (i/256) + ')';
-            ctx.fillRect(x, y, 1, 1);
-        }
-    }
-    var imgdata1 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
-    var olddata = [];
-    for (var i = 0; i < imgdata1.data.length; ++i)
-        olddata[i] = imgdata1.data[i];
-    ctx.putImageData(imgdata1, 0.1, 0.2);
-    var imgdata2 = ctx.getImageData(0.1, 0.2, 15.8, 15.9);
-    for (var i = 0; i < imgdata2.data.length; ++i) {
-        @assert olddata[i] === imgdata2.data[i];
-    }
-    t.done();
-
-- name: 2d.imageData.put.unaffected
-  desc: putImageData() is not affected by context state
-  code: |
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.globalAlpha = 0.1;
-    ctx.globalCompositeOperation = 'destination-atop';
-    ctx.shadowColor = '#f00';
-    ctx.shadowBlur = 1;
-    ctx.translate(100, 50);
-    ctx.scale(0.1, 0.1);
-    ctx.putImageData(imgdata, 0, 0);
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.clip
-  desc: putImageData() is not affected by clipping regions
-  code: |
-    ctx.fillStyle = '#0f0';
-    ctx.fillRect(0, 0, 100, 50)
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.beginPath();
-    ctx.rect(0, 0, 50, 50);
-    ctx.clip();
-    ctx.putImageData(imgdata, 0, 0);
-    @assert pixel 25,25 ==~ 0,255,0,255;
-    @assert pixel 75,25 ==~ 0,255,0,255;
-    t.done();
-
-- name: 2d.imageData.put.path
-  desc: putImageData() does not affect the current path
-  code: |
-    ctx.fillStyle = '#f00';
-    ctx.fillRect(0, 0, 100, 50)
-    ctx.rect(0, 0, 100, 50);
-    var imgdata = ctx.getImageData(0, 0, 100, 50);
-    ctx.putImageData(imgdata, 0, 0);
-    ctx.fillStyle = '#0f0';
-    ctx.fill();
-    @assert pixel 50,25 ==~ 0,255,0,255;
-    t.done();
diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html
deleted file mode 100644
index b8c17c3a416..00000000000
--- a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contentEditable-invalidvalue.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>contentEditable setter: invalid value</title>
-<link rel="author" title="Denis Ah-Kang" href="mailto:denis@w3.org">
-<link rel=help href="https://html.spec.whatwg.org/multipage/#contenteditable">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id="log"></div>
-<script>
-  var el = document.createElement("div");
-  test(function(){
-    assert_throws_dom("SyntaxError", function() {
-      el.contentEditable = "foobar";
-    });
-  }, "setting contentEditable to an invalid value throws a SyntaxError Exception");
-</script>
diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html
index 209686680e9..0125b95667f 100644
--- a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html
+++ b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/contenteditable-enumerated-ascii-case-insensitive.html
@@ -5,20 +5,41 @@
 <meta name="assert" content="@contenteditable values are ASCII case-insensitive">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<div contenteditable="false"></div>
-<div contenteditable="FaLsE"></div>
-<div contenteditable="falſe"></div>
-<div></div>
+
 <script>
-const div = document.querySelectorAll("div");
+function testValue(value, isValid) {
+  const valueLower = value.toLowerCase();
 
-test(() => {
-  assert_equals(div[0].contentEditable, "false", "lowercase valid");
-  assert_equals(div[1].contentEditable, "false", "mixed case valid");
-  assert_equals(div[2].contentEditable, "inherit", "non-ASCII invalid");
+  test(() => {
+    const el = document.createElement('div');
+    if (valueLower !== "inherit") {
+      el.setAttribute('contenteditable', value);
+    }
+    assert_equals(el.contentEditable, isValid ? valueLower : "inherit");
+  }, `IDL attribute getter for attribute value "${value}"`);
 
-  assert_throws_dom("SyntaxError", () => {
-    div[3].contentEditable = "falſe";
-  }, "non-ASCII rejected by IDL");
-}, "keyword false");
+  test(() => {
+    const el = document.createElement('div');
+    if (isValid) {
+      el.contentEditable = value;
+      assert_equals(el.getAttribute('contenteditable'), valueLower === "inherit" ? null : valueLower);
+    } else {
+      assert_throws_dom("SyntaxError", () => {
+        el.contentEditable = value;
+      });
+    }
+  }, `IDL attribute setter for value "${value}"`);
+}
+
+const valid = ["true", "false", "inherit", "plaintext-only"]; // "inherit" is treated specially
+const invalid = ["foobar", "falſe", "plaıntext-only", "plaİntext-only"];
+
+for (const value of valid) {
+  testValue(value, true);
+  testValue(value.toUpperCase(), true);
+}
+
+for (const value of invalid) {
+  testValue(value, false);
+}
 </script>
diff --git a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html
index 2e51109fa7a..19b21863e09 100644
--- a/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html
+++ b/tests/wpt/web-platform-tests/html/editing/editing-0/contenteditable/user-interaction-editing-contenteditable.html
@@ -53,6 +53,16 @@
         el.contentEditable = "true";
         el.removeAttribute("contenteditable");
       }, 'set contentEditable = "true" and then remove contenteditable attribute', false, "inherit");
+
+      testContentEditable(el => {
+        el.setAttribute("contenteditable", "plaintext-only");
+      }, "contentEditable=plaintext-only attribute", true, "plaintext-only");
+
+      testContentEditable(el => {
+        const parent = document.createElement("div");
+        parent.appendChild(el);
+        parent.contentEditable = "plaintext-only";
+      }, 'set parent element contentEditable = "plaintext-only"', true, "inherit");
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html
new file mode 100644
index 00000000000..ae0de29a89e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-form-submission-unusual.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<title>Test dialog form submission, unusual cases</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div id=log></div>
+
+<dialog>
+  <form method=dialog action="https://test:test/" target=doesnotmatter rel=noopener>
+    <input type=submit formaction="https://test:test/" id=submit-1>
+    <input type=submit id=submit-2>
+  </form>
+</dialog>
+
+<script>
+test(() => {
+  const dialog = document.querySelector("dialog");
+  dialog.showModal();
+  assert_true(dialog.open);
+
+  document.getElementById("submit-1").click();
+  assert_false(dialog.open);
+}, "A form's action and rel=noopener are ignored during submission");
+
+test(() => {
+  const dialog = document.querySelector("dialog");
+  dialog.showModal();
+  assert_true(dialog.open);
+
+  document.getElementById("submit-2").click();
+  assert_false(dialog.open);
+}, "A form's action and rel=noopener are ignored during submission, part 2");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus.html b/tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus.html
index a8555d7647c..771efada1ad 100644
--- a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus.html
+++ b/tests/wpt/web-platform-tests/html/semantics/popovers/popover-focus.html
@@ -129,7 +129,7 @@
       popover.showPopover();
       assert_equals(document.activeElement, expectedFocusedElement, `${testName} activated by popover.showPopover()`);
       assert_equals(popover.popover, 'auto', 'All popovers in this test should start as popover=auto');
-      popover.popover = 'hint';
+      popover.popover = 'manual';
       assert_false(popover.matches(':open'), 'Changing the popover type should hide the popover');
       assert_equals(document.activeElement, priorFocus, 'prior element should get focus when the type is changed');
       assert_false(isElementVisible(popover));
diff --git a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-interactions.html b/tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-interactions.html
index 6ef6938810b..6e707cb45be 100644
--- a/tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-interactions.html
+++ b/tests/wpt/web-platform-tests/html/semantics/popovers/popover-top-layer-interactions.html
@@ -13,7 +13,7 @@
 <body>
 <script>
 const types = Object.freeze({
-  popover: Symbol("Popover API"),
+  popover: Symbol("Popover"),
   modalDialog: Symbol("Modal Dialog"),
   fullscreen: Symbol("Fullscreen Element"),
 });
@@ -30,17 +30,17 @@ const examples = [
     type: types.modalDialog,
     closes: [types.popover],
     createElement: () => document.createElement('dialog'),
-    trigger: function() {this.element.showModal();this.showing=true;},
-    close: function() {this.element.close();this.showing=false;},
-    isTopLayer: function() {return !!(this.element.isConnected && this.showing);},
+    trigger: function() {this.element.showModal()},
+    close: function() {this.element.close()},
+    isTopLayer: function() {return this.element.matches(':modal')},
   },
   {
     type: types.fullscreen,
     closes: [types.popover],
     createElement: () => document.createElement('div'),
     trigger: async function(visibleElement) {assert_false(this.isTopLayer());await blessTopLayer(visibleElement);await this.element.requestFullscreen();},
-    close: function() {document.exitFullscreen();},
-    isTopLayer: function() {return this.element.matches(':fullscreen');},
+    close: async function() {await document.exitFullscreen();},
+    isTopLayer: function() {return this.element.matches(':fullscreen')},
   },
 ];
 
@@ -53,10 +53,10 @@ function createElement(ex) {
   assert_false(ex.isTopLayer(),'Element should start out not in the top layer');
   return element;
 }
-function doneWithExample(ex) {
+async function doneWithExample(ex) {
   assert_true(!!ex.element);
   if (ex.isTopLayer())
-    ex.close();
+    await ex.close();
   ex.element.remove();
   ex.element = null;
 }
@@ -66,11 +66,16 @@ for(let i=0;i<examples.length;++i) {
     const example1 = Object.assign([],examples[i]);
     const example2 = Object.assign([],examples[j]);
     const shouldClose = example2.closes.includes(example1.type);
-    const desc = `A ${example2.type.description} should ${shouldClose ? "" : "*not*"} close a ${example1.type.description}`;
+    const desc = `A ${example2.type.description} should${shouldClose ? "" : " *not*"} close a ${example1.type.description}.`;
     promise_test(async t => {
       const element1 = createElement(example1);
       const element2 = createElement(example2);
-      t.add_cleanup(() => {doneWithExample(example1);doneWithExample(example2);});
+      t.add_cleanup(() => {
+        return Promise.all([
+          doneWithExample(example1),
+          doneWithExample(example2),
+        ]);
+      });
       await example1.trigger(document.body); // Open the 1st top layer element
       assert_true(example1.isTopLayer()); // Make sure it is top layer
       await example2.trigger(element1); // Open the 2nd top layer element
diff --git a/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html
new file mode 100644
index 00000000000..83def572998
--- /dev/null
+++ b/tests/wpt/web-platform-tests/long-animation-frame/tentative/loaf-iframe-popup.html
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Long Animation Frame Timing: iframes & popups</title>
+<meta name="timeout" content="long">
+<body>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="resources/utils.js"></script>
+<div id="log"></div>
+<script>
+const host_info = get_host_info();
+const {ORIGIN, REMOTE_ORIGIN, HTTP_NOTSAMESITE_ORIGIN} = host_info;
+
+promise_test(async t => {
+    const executor = await prepare_exec_iframe(t, ORIGIN);
+    await expect_no_long_frame(() => executor.execute_script((duration) => {
+        const deadline = performance.now() + duration;
+        while (performance.now() < deadline) {}
+    }, [very_long_frame_duration]), t);
+}, 'A long busy wait without render in a same-origin iframe is not a long animation frame');
+
+promise_test(async t => {
+    const executor = await prepare_exec_iframe(t, HTTP_NOTSAMESITE_ORIGIN);
+    await expect_no_long_frame(() => executor.execute_script((duration) => {
+        const deadline = performance.now() + duration;
+        while (performance.now() < deadline) {}
+    }, [very_long_frame_duration]), t);
+}, 'A long busy wait in a cross-origin iframe is not a long animation frame');
+
+promise_test(async t => {
+    const executor = await prepare_exec_iframe(t, ORIGIN);
+    await expect_long_frame(() => executor.execute_script(async (duration) => {
+        await new Promise(resolve => window.requestAnimationFrame(resolve));
+        const deadline = performance.now() + duration;
+        while (performance.now() < deadline) {}
+    }, [very_long_frame_duration]), t);
+}, 'A long busy wait in a same-origin requestAnimationFrame is a long animation frame');
+
+promise_test(async t => {
+    const executor = await prepare_exec_popup(t, ORIGIN);
+    await expect_no_long_frame(() => executor.execute_script((duration) => {
+        const deadline = performance.now() + duration;
+        while (performance.now() < deadline) {}
+    }, [very_long_frame_duration]), t);
+}, 'A long busy wait in a same-origin popup is a not long animation frame');
+
+for (const origin of ["ORIGIN", "REMOTE_ORIGIN", "HTTP_NOTSAMESITE_ORIGIN"]) {
+    promise_test(async t => {
+        const executor = await prepare_exec_iframe(t, host_info[origin]);
+        const entry = await executor.execute_script(async (duration) => {
+            const entryPromise = new Promise(resolve => new PerformanceObserver(list => {
+                resolve(list.getEntries(0));
+            }).observe({entryTypes: ["long-animation-frame"]}));
+            const deadline = performance.now() + duration;
+            while (performance.now() < deadline) {}
+            return entryPromise;
+        }, [very_long_frame_duration]);
+    }, `frames receive own long animation frames (${origin})`);
+}
+
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-detached-context.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-detached-context.html
index f8a8699ad9f..bd49a720b90 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-detached-context.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-detached-context.html
@@ -16,7 +16,7 @@
     try {
       new recorderFunc(new MediaStream);
     } catch (err) {
-      assert_equals(err.name, 'NotAllowedError');
+      assert_equals(err.name, 'NotSupportedError');
       t.done();
     }
     assert_unreached('MediaRecorder should have failed');
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html
index 54e83ecac76..97e781054f3 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html
@@ -13,10 +13,10 @@
         const {stream: video, control} = createVideoStream(t);
         const {stream: audio} = createAudioStream(t);
         const recorder = new MediaRecorder(video);
-        recorder.onerror = t.step_func(mediaRecorderErrorEvent => {
-            assert_true(mediaRecorderErrorEvent instanceof MediaRecorderErrorEvent, 'the type of event should be MediaRecorderErrorEvent');
-            assert_equals(mediaRecorderErrorEvent.error.name, 'InvalidModificationError', 'the type of error should be InvalidModificationError when track has been added or removed');
-            assert_true(mediaRecorderErrorEvent.isTrusted, 'isTrusted should be true when the event is created by C++');
+        recorder.onerror = t.step_func(event => {
+            assert_true(event instanceof ErrorEvent, 'the type of event should be ErrorEvent');
+            assert_equals(event.error.name, 'InvalidModificationError', 'the type of error should be InvalidModificationError when track has been added or removed');
+            assert_true(event.isTrusted, 'isTrusted should be true when the event is created by C++');
             assert_equals(recorder.state, "inactive", "MediaRecorder has been stopped after adding a track to stream");
             t.done();
         });
@@ -32,10 +32,10 @@
     async_test(t => {
       const {stream: video, control} = createVideoStream(t);
         const recorder = new MediaRecorder(video);
-        recorder.onerror = t.step_func(mediaRecorderErrorEvent => {
-            assert_true(mediaRecorderErrorEvent instanceof MediaRecorderErrorEvent, 'the type of event should be MediaRecorderErrorEvent');
-            assert_equals(mediaRecorderErrorEvent.error.name, 'InvalidModificationError', 'the type of error should be InvalidModificationError when track has been added or removed');
-            assert_true(mediaRecorderErrorEvent.isTrusted, 'isTrusted should be true when the event is created by C++');
+        recorder.onerror = t.step_func(event => {
+            assert_true(event instanceof ErrorEvent, 'the type of event should be ErrorEvent');
+            assert_equals(event.error.name, 'InvalidModificationError', 'the type of error should be InvalidModificationError when track has been added or removed');
+            assert_true(event.isTrusted, 'isTrusted should be true when the event is created by C++');
             assert_equals(recorder.state, "inactive", "MediaRecorder has been stopped after removing a track from stream");
             t.done();
         });
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/overconstrained_error.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/overconstrained_error.https.html
new file mode 100644
index 00000000000..abaff3b7731
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/overconstrained_error.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+</head>
+<body>
+<script>
+
+promise_test(async t => {
+  try {
+    stream = await navigator.mediaDevices.getUserMedia(
+      {video: {width: {exact: 639}, resizeMode: {exact: "none"}}});
+    t.add_cleanup(()=>stream.getVideoTracks()[0].stop());
+    t.step(() => assert_unreached('applyConstraints should have failed'));
+  } catch(e) {
+    assert_true(e instanceof DOMException);
+    assert_equals(e.name, 'OverconstrainedError');
+    assert_equals(e.constraint, 'width');
+  }
+}, 'Error of OverconstrainedError type inherit from DOMException');
+
+promise_test(async t => {
+    assert_true(new OverconstrainedError("constraint") instanceof DOMException);
+}, 'OverconstrainedError class inherits from DOMException');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/resources/testdriver.js b/tests/wpt/web-platform-tests/resources/testdriver.js
index 76ae2834fdf..f8bb14c6e48 100644
--- a/tests/wpt/web-platform-tests/resources/testdriver.js
+++ b/tests/wpt/web-platform-tests/resources/testdriver.js
@@ -220,6 +220,40 @@
             return cookie;
         },
 
+        /**
+         * Get Computed Label for an element.
+         *
+         * This matches the behaviour of the
+         * `Get Computed Label
+         * <https://w3c.github.io/webdriver/#dfn-get-computed-label>`_
+         * WebDriver command.
+         *
+         * @param {Element} element
+         * @returns {Promise} fulfilled after the computed label is returned, or
+         *                    rejected in the cases the WebDriver command errors
+         */
+        get_computed_label: async function(element) {
+            let label = await window.test_driver_internal.get_computed_label(element);
+            return label;
+        },
+
+        /**
+         * Get Computed Role for an element.
+         *
+         * This matches the behaviour of the
+         * `Get Computed Label
+         * <https://w3c.github.io/webdriver/#dfn-get-computed-role>`_
+         * WebDriver command.
+         *
+         * @param {Element} element
+         * @returns {Promise} fulfilled after the computed role is returned, or
+         *                    rejected in the cases the WebDriver command errors
+         */
+        get_computed_role: async function(element) {
+            let role = await window.test_driver_internal.get_computed_role(element);
+            return role;
+        },
+
         /**
          * Send keys to an element.
          *
diff --git a/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html b/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html
new file mode 100644
index 00000000000..b2f630a3197
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  'use strict';
+
+  promise_test(async (t) => {
+    await promise_rejects_dom(
+        t, 'SecurityError', navigator.serial.getPorts(),
+        'getPorts() should throw a SecurityError DOMException when called ' +
+        'from a context where the top-level document has an opaque origin.');
+  }, 'Calls to Serial APIs from an origin with opaque top origin get blocked.');
+</script>
diff --git a/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html.headers b/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html.headers
new file mode 100644
index 00000000000..1efcf8c226f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/getPorts/reject_opaque_origin.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts
diff --git a/tests/wpt/web-platform-tests/serial/getPorts/sandboxed_iframe.https.window.js b/tests/wpt/web-platform-tests/serial/getPorts/sandboxed_iframe.https.window.js
new file mode 100644
index 00000000000..8fae11ccfe5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/getPorts/sandboxed_iframe.https.window.js
@@ -0,0 +1,22 @@
+'use strict';
+
+let iframe = document.createElement('iframe');
+
+promise_test(async () => {
+  await new Promise(resolve => {
+    iframe.src = '../resources/open-in-iframe.html';
+    iframe.sandbox.add('allow-scripts');
+    iframe.allow = 'serial';
+    document.body.appendChild(iframe);
+    iframe.addEventListener('load', resolve);
+  });
+
+  await new Promise(resolve => {
+    iframe.contentWindow.postMessage({type: 'GetPorts'}, '*');
+
+    window.addEventListener('message', (messageEvent) => {
+      assert_equals('Success', messageEvent.data);
+      resolve();
+    });
+  });
+}, 'GetPorts from a sandboxed iframe is valid.');
diff --git a/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html b/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html
new file mode 100644
index 00000000000..ade8ae7392e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  'use strict';
+
+  promise_test(async (t) => {
+    await promise_rejects_dom(
+        t, 'SecurityError', navigator.serial.requestPort(),
+        'requestPort() should throw a SecurityError DOMException when called ' +
+        'from a context where the top-level document has an opaque origin.');
+  }, 'Calls to Serial APIs from an origin with opaque top origin get blocked.');
+</script>
diff --git a/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html.headers b/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html.headers
new file mode 100644
index 00000000000..1efcf8c226f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/requestPort/reject_opaque_origin.https.html.headers
@@ -0,0 +1 @@
+Content-Security-Policy: sandbox allow-scripts
diff --git a/tests/wpt/web-platform-tests/serial/requestPort/sandboxed_iframe.https.window.js b/tests/wpt/web-platform-tests/serial/requestPort/sandboxed_iframe.https.window.js
new file mode 100644
index 00000000000..6e169510a0b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/requestPort/sandboxed_iframe.https.window.js
@@ -0,0 +1,26 @@
+'use strict';
+
+let iframe = document.createElement('iframe');
+
+promise_test(async () => {
+  await new Promise(resolve => {
+    iframe.src = '../resources/open-in-iframe.html';
+    iframe.sandbox.add('allow-scripts');
+    iframe.allow = 'serial';
+    document.body.appendChild(iframe);
+    iframe.addEventListener('load', resolve);
+  });
+
+  await new Promise(resolve => {
+    iframe.contentWindow.postMessage({type: 'RequestPort'}, '*');
+
+    window.addEventListener('message', (messageEvent) => {
+      // The failure message of no device chosen is expected. The point here is
+      // to validate not failing because of a sandboxed iframe.
+      assert_equals(
+          'FAIL: NotFoundError: Failed to execute \'requestPort\' on \'Serial\': No port selected by the user.',
+          messageEvent.data);
+      resolve();
+    });
+  });
+}, 'RequestPort from a sandboxed iframe is valid.');
diff --git a/tests/wpt/web-platform-tests/serial/resources/open-in-iframe.html b/tests/wpt/web-platform-tests/serial/resources/open-in-iframe.html
new file mode 100644
index 00000000000..9bf8beb66aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/serial/resources/open-in-iframe.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<body>
+  <button>Fake user gesture</button>
+</body>
+
+<script>
+  'use strict';
+
+  test_driver.set_test_context(parent);
+
+  window.onmessage = messageEvent => {
+    switch (messageEvent.data.type) {
+      case 'GetPorts':
+        navigator.serial.getPorts()
+            .then(ports => parent.postMessage('Success', '*'))
+            .catch(err => parent.postMessage(`FAIL: ${err}`, '*'));
+        break;
+      case 'RequestPort':
+        test_driver.click(document.getElementsByTagName('button')[0])
+            .then(() => navigator.serial.requestPort({filters: []}))
+            .then(port => parent.postMessage('Success', '*'))
+            .catch(err => parent.postMessage(`FAIL: ${err}`, '*'));
+        break;
+      default:
+        parent.postMessage(
+            `FAIL: Bad message type: ${messageEvent.data}`, '*');
+    };
+  };
+</script>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus-within-shadow.html b/tests/wpt/web-platform-tests/shadow-dom/focus-within-shadow.html
new file mode 100644
index 00000000000..e65165a786d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus-within-shadow.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" href="mailto:masonf@chromium.org">
+<link rel="help" href="https://crbug.com/1300584">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/declarative-shadow-dom-polyfill.js"></script>
+
+<div id=host>
+  <template shadowrootmode=open>
+    <button><slot></slot></button>
+  </template>
+  <span>Content</span>
+</div>
+
+<script>
+  const host = document.getElementById('host');
+  setup(() => {
+    polyfill_declarative_shadow_dom(host);
+  });
+  test(() => {
+    const shadowButton = host.shadowRoot.querySelector('button');
+    shadowButton.focus();
+    assert_equals(document.activeElement,host,'nodes within shadow DOM aren\'t exposed');
+    host.textContent = 'New Content';
+    assert_equals(document.activeElement,host,'Clearing light DOM shouldn\'t clear focus');
+  },'Don\'t clear focus within shadow root if light DOM children are cleared');
+</script>
+
diff --git a/tests/wpt/web-platform-tests/storage-access-api/helpers.js b/tests/wpt/web-platform-tests/storage-access-api/helpers.js
index d2ded9a946c..ddc638434ae 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/helpers.js
+++ b/tests/wpt/web-platform-tests/storage-access-api/helpers.js
@@ -196,6 +196,12 @@ function FrameInitiatedNavigation(frame, url) {
   return load;
 }
 
+// Makes a subresource request to the provided host in the given frame, and returns the cookies in the response.
+function FetchFromFrame(frame, host) {
+  return PostMessageAndAwaitReply(
+    { command: "subresource cookies", host }, frame.contentWindow);
+}
+
 // Tries to set storage access policy, ignoring any errors.
 //
 // Note: to discourage the writing of tests that assume unpartitioned cookie
diff --git a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js b/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
index 41f2f5c74ec..5496e89670c 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
+++ b/tests/wpt/web-platform-tests/storage-access-api/requestStorageAccess-cross-site-sibling-iframes.sub.https.window.js
@@ -5,12 +5,15 @@
 'use strict';
 
 (async function() {
-  // This is on the alt domain, so it's cross-site from the current document.
-  const wwwAlt = "https://{{hosts[alt][www]}}:{{ports[https][0]}}";
+  // This is on the www subdomain, so it's cross-origin from the current document.
+  const www = "https://{{domains[www]}}:{{ports[https][0]}}";
+  // This is on the alt host, so it's cross-site from the current document.
+  const wwwAlt = "https://{{hosts[alt][]}}:{{ports[https][0]}}";
+  const url_suffix = "/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js";
 
   promise_test(async (t) => {
     await MaybeSetStorageAccess("*", "*", "blocked");
-    const responder_html = `${wwwAlt}/storage-access-api/resources/script-with-cookie-header.py?script=embedded_responder.js`;
+    const responder_html = `${wwwAlt}${url_suffix}`;
     const [frame1, frame2] = await Promise.all([
       CreateFrame(responder_html),
       CreateFrame(responder_html),
@@ -43,4 +46,36 @@
     assert_true(await FrameHasStorageAccess(frame2), "frame2 should have storage access after it requested it.");
     assert_true(await CanFrameWriteCookies(frame2), "frame2 should be able to write cookies via document.cookie after getting storage access.");
   }, "Grants have per-frame scope");
+
+  promise_test(async (t) => {
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    const [crossOriginFrame, crossSiteFrame] = await Promise.all([
+      CreateFrame(`${www}${url_suffix}`),
+      CreateFrame(`${wwwAlt}${url_suffix}`),
+    ]);
+
+    t.add_cleanup(async () => {
+      await test_driver.delete_all_cookies();
+      await SetPermissionInFrame(crossOriginFrame, [{ name: 'storage-access' }, 'prompt']);
+      await SetPermissionInFrame(crossSiteFrame, [{ name: 'storage-access' }, 'prompt']);
+      await MaybeSetStorageAccess("*", "*", "allowed");
+    });
+
+    await SetPermissionInFrame(crossOriginFrame, [{ name: 'storage-access' }, 'granted']);
+    await SetPermissionInFrame(crossSiteFrame, [{ name: 'storage-access' }, 'granted']);
+
+    assert_true(await RequestStorageAccessInFrame(crossOriginFrame), "crossOriginFrame should be able to get storage access without a gesture.");
+    assert_true(await RequestStorageAccessInFrame(crossSiteFrame), "crossSiteFrame should be able to get storage access without a gesture.");
+
+    await SetDocumentCookieFromFrame(crossOriginFrame, `cookie=monster;Secure;SameSite=None;Path=/`);
+    await SetDocumentCookieFromFrame(crossSiteFrame, `foo=bar;Secure;SameSite=None;Path=/`);
+
+    assert_true(cookieStringHasCookie("cookie", "monster", await FetchFromFrame(crossOriginFrame, www)),"crossOriginFrame making same-origin subresource request can access cookies.");
+    assert_true(cookieStringHasCookie("foo", "bar", await FetchFromFrame(crossSiteFrame, wwwAlt)),"crossSiteFrame making same-origin subresource request can access cookies.");
+
+    assert_false(cookieStringHasCookie("foo", "bar",  await FetchFromFrame(crossOriginFrame, wwwAlt)), "crossOriginFrame making cross-site subresource request to sibling iframe's host should not include cookies.");
+    assert_false(cookieStringHasCookie("cookie", "monster", await FetchFromFrame(crossSiteFrame, www)),"crossSiteFrame making cross-site subresource request to sibling iframe's host should not include cookies.");
+
+  }, "Cross-site sibling iframes should not be able to take advantage of the existing permission grant requested by others.");
+
 })();
diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/echo-cookie-header.py b/tests/wpt/web-platform-tests/storage-access-api/resources/echo-cookie-header.py
index 546e76e509a..f1599e3a899 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/resources/echo-cookie-header.py
+++ b/tests/wpt/web-platform-tests/storage-access-api/resources/echo-cookie-header.py
@@ -1,4 +1,12 @@
 def main(request, response):
+  # Set the cors enabled headers.
+  origin = request.headers.get(b"Origin")
+  headers = []
+  if origin is not None and origin != b"null":
+      headers.append((b"Content-Type", b"text/plain"))
+      headers.append((b"Access-Control-Allow-Origin", origin))
+      headers.append((b"Access-Control-Allow-Credentials", 'true'))
+
   cookie_header = request.headers.get(b"Cookie", b"")
 
-  return (200, [], cookie_header)
+  return (200, headers, cookie_header)
diff --git a/tests/wpt/web-platform-tests/storage-access-api/resources/embedded_responder.js b/tests/wpt/web-platform-tests/storage-access-api/resources/embedded_responder.js
index fe33f3125fa..ab1ab30f696 100644
--- a/tests/wpt/web-platform-tests/storage-access-api/resources/embedded_responder.js
+++ b/tests/wpt/web-platform-tests/storage-access-api/resources/embedded_responder.js
@@ -48,6 +48,10 @@ window.addEventListener("message", async (event) => {
       // script-with-cookie-header.py.
       reply(httpCookies);
       break;
+    case "subresource cookies":
+      const cookie = await fetch(`${event.data.host}/storage-access-api/resources/echo-cookie-header.py`, {mode: 'cors', credentials: 'include'}).then((resp) => resp.text());
+      reply(cookie);
+      break;
     default:
   }
 });
diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.window.js b/tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js
similarity index 88%
rename from tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.window.js
rename to tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js
index 15400f69340..d2b37f00a9d 100644
--- a/tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.window.js
+++ b/tests/wpt/web-platform-tests/streams/readable-byte-streams/enqueue-with-detached-buffer.any.js
@@ -1,3 +1,5 @@
+// META: global=window,worker
+
 promise_test(async t => {
   const error = new Error('cannot proceed');
   const rs = new ReadableStream({
@@ -5,7 +7,7 @@ promise_test(async t => {
     pull: t.step_func((controller) => {
       const buffer = controller.byobRequest.view.buffer;
       // Detach the buffer.
-      postMessage(buffer, '*', [buffer]);
+      structuredClone(buffer, { transfer: [buffer] });
 
       // Try to enqueue with a new buffer.
       assert_throws_js(TypeError, () => controller.enqueue(new Uint8Array([42])));
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 030e3fc56be..ba01e1fe866 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -893,6 +893,14 @@ class Element:
     def attribute(self, name):
         return self.send_element_command("GET", "attribute/%s" % name)
 
+    @command
+    def get_computed_label(self):
+        return self.send_element_command("GET", "computedlabel")
+
+    @command
+    def get_computed_role(self):
+        return self.send_element_command("GET", "computedrole")
+
     # This MUST come last because otherwise @property decorators above
     # will be overridden by this.
     @command
diff --git a/tests/wpt/web-platform-tests/tools/webtransport/h3/webtransport_h3_server.py b/tests/wpt/web-platform-tests/tools/webtransport/h3/webtransport_h3_server.py
index ea0267d3d32..9d62f09926f 100644
--- a/tests/wpt/web-platform-tests/tools/webtransport/h3/webtransport_h3_server.py
+++ b/tests/wpt/web-platform-tests/tools/webtransport/h3/webtransport_h3_server.py
@@ -481,10 +481,18 @@ class WebTransportH3Server:
         self.started = True
 
     def _start_on_server_thread(self) -> None:
+        secrets_log_file = None
+        if "SSLKEYLOGFILE" in os.environ:
+            try:
+                secrets_log_file = open(os.environ["SSLKEYLOGFILE"], "a")
+            except Exception as e:
+                _logger.warn(str(e))
+
         configuration = QuicConfiguration(
             alpn_protocols=H3_ALPN,
             is_client=False,
             max_datagram_frame_size=65536,
+            secrets_log_file=secrets_log_file,
         )
 
         _logger.info("Starting WebTransport over HTTP/3 server on %s:%s",
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 66796a8968d..7d789f6a71c 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -1883,6 +1883,32 @@ class WebKit(Browser):
         return None
 
 
+class WebKitTestRunner(Browser):
+    """Interface for WebKitTestRunner.
+    """
+
+    product = "wktr"
+    requirements = None
+
+    def download(self, dest=None, channel=None, rename=None):
+        raise NotImplementedError
+
+    def install(self, dest=None, channel=None):
+        raise NotImplementedError
+
+    def install_webdriver(self, dest=None, channel=None, browser_binary=None):
+        raise NotImplementedError
+
+    def find_binary(self, venv_path=None, channel=None):
+        return None
+
+    def find_webdriver(self, venv_path=None, channel=None):
+        return None
+
+    def version(self, binary=None, webdriver_binary=None):
+        return None
+
+
 class WebKitGTKMiniBrowser(WebKit):
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 468bea3c51f..0b7d73b2042 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -110,7 +110,7 @@ otherwise install OpenSSL and ensure that it's on your $PATH.""")
 def check_environ(product):
     if product not in ("android_weblayer", "android_webview", "chrome",
                        "chrome_android", "chrome_ios", "content_shell",
-                       "firefox", "firefox_android", "servo"):
+                       "firefox", "firefox_android", "servo", "wktr"):
         config_builder = serve.build_config(os.path.join(wpt_root, "config.json"))
         # Override the ports to avoid looking for free ports
         config_builder.ssl = {"type": "none"}
@@ -686,6 +686,17 @@ class WebKit(BrowserSetup):
         pass
 
 
+class WebKitTestRunner(BrowserSetup):
+    name = "wktr"
+    browser_cls = browser.WebKitTestRunner
+
+    def install(self, channel=None):
+        raise NotImplementedError
+
+    def setup_kwargs(self, kwargs):
+        pass
+
+
 class WebKitGTKMiniBrowser(BrowserSetup):
     name = "webkitgtk_minibrowser"
     browser_cls = browser.WebKitGTKMiniBrowser
@@ -755,6 +766,7 @@ product_setup = {
     "sauce": Sauce,
     "opera": Opera,
     "webkit": WebKit,
+    "wktr": WebKitTestRunner,
     "webkitgtk_minibrowser": WebKitGTKMiniBrowser,
     "epiphany": Epiphany,
 }
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py
index b2a53ca23a7..9724bb957b5 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py
@@ -42,4 +42,5 @@ product_list = ["android_weblayer",
                 "opera",
                 "webkit",
                 "webkitgtk_minibrowser",
+                "wktr",
                 "epiphany"]
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/wktr.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/wktr.py
new file mode 100644
index 00000000000..8d429f357b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/wktr.py
@@ -0,0 +1,239 @@
+# mypy: allow-untyped-defs
+
+import gc
+import os
+import sys
+from multiprocessing import Queue
+from subprocess import PIPE
+from threading import Thread
+from mozprocess import ProcessHandlerMixin
+
+from .base import Browser, ExecutorBrowser
+from .base import get_timeout_multiplier   # noqa: F401
+from ..executors import executor_kwargs as base_executor_kwargs
+from ..executors.executorwktr import (  # noqa: F401
+    WKTRCrashtestExecutor,
+    WKTRRefTestExecutor,
+    WKTRTestharnessExecutor,
+)
+
+
+__wptrunner__ = {"product": "WebKitTestRunner",
+                 "check_args": "check_args",
+                 "browser": "WKTRBrowser",
+                 "executor": {
+                     "crashtest": "WKTRCrashtestExecutor",
+                     "reftest": "WKTRRefTestExecutor",
+                     "testharness": "WKTRTestharnessExecutor",
+                 },
+                 "browser_kwargs": "browser_kwargs",
+                 "executor_kwargs": "executor_kwargs",
+                 "env_extras": "env_extras",
+                 "env_options": "env_options",
+                 "update_properties": "update_properties",
+                 "timeout_multiplier": "get_timeout_multiplier",}
+
+
+def check_args(**kwargs):
+    pass
+
+
+def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
+    args = list(kwargs["binary_args"])
+
+    args.append("--allow-any-certificate-for-allowed-hosts")
+
+    for host in config.domains_set:
+        args.append('--allowed-host')
+        args.append(host)
+
+    args.append("-")
+
+    return {"binary": kwargs["binary"],
+            "binary_args": args}
+
+
+def executor_kwargs(logger, test_type, test_environment, run_info_data,
+                    **kwargs):
+    executor_kwargs = base_executor_kwargs(test_type, test_environment, run_info_data,
+                                           **kwargs)
+    return executor_kwargs
+
+
+def env_extras(**kwargs):
+    return []
+
+
+def env_options():
+    return {"server_host": "127.0.0.1",
+            "testharnessreport": "testharnessreport-wktr.js"}
+
+
+def update_properties():
+    return (["debug", "os", "processor"], {"os": ["version"], "processor": ["bits"]})
+
+
+class WKTRBrowser(Browser):
+    """Class that represents an instance of WebKitTestRunner.
+
+    Upon startup, the stdout, stderr, and stdin pipes of the underlying WebKitTestRunner
+    process are connected to multiprocessing Queues so that the runner process can
+    interact with WebKitTestRunner through its protocol mode.
+    """
+
+    def __init__(self, logger, binary="WebKitTestRunner", binary_args=[], **kwargs):
+        super().__init__(logger)
+
+        self._args = [binary] + binary_args
+        self._proc = None
+
+        build_root_path = os.path.dirname(binary)
+
+        def append_env(var, item, separator):
+            raw = os.environ.get(var)
+            old = raw.split(separator) if raw is not None else []
+            return separator.join(old + [item])
+
+        env = {}
+
+        if sys.platform.startswith("darwin"):
+            env["CA_DISABLE_GENERIC_SHADERS"] = "1"
+            env["__XPC_CA_DISABLE_GENERIC_SHADERS"] = "1"
+
+            env["DYLD_LIBRARY_PATH"] = append_env(
+                "DYLD_LIBRARY_PATH", build_root_path, ":"
+            )
+            env["__XPC_DYLD_LIBRARY_PATH"] = append_env(
+                "__XPC_DYLD_LIBRARY_PATH", build_root_path, ":"
+            )
+            env["DYLD_FRAMEWORK_PATH"] = append_env(
+                "DYLD_FRAMEWORK_PATH", build_root_path, ":"
+            )
+            env["__XPC_DYLD_FRAMEWORK_PATH"] = append_env(
+                "__XPC_DYLD_FRAMEWORK_PATH", build_root_path, ":"
+            )
+
+            env["SQLITE_EXEMPT_PATH_FROM_VNODE_GUARDS"] = "/"
+            env["__XPC_SQLITE_EXEMPT_PATH_FROM_VNODE_GUARDS"] = "/"
+
+        self._extra_env = env
+
+    def start(self, group_metadata, **kwargs):
+        self.logger.debug("Starting WebKitTestRunner: %s..." % self._args[0])
+        #self.logger.debug(repr(self._args))
+
+        env = os.environ
+        env.update(self._extra_env)
+
+        # Unfortunately we need to use the Process class directly because we do not
+        # want mozprocess to do any output handling at all.
+        self._proc = ProcessHandlerMixin.Process(
+            self._args, stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env
+        )
+        if os.name == "posix":
+            self._proc.pgid = ProcessHandlerMixin._getpgid(self._proc.pid)
+            self._proc.detached_pid = None
+
+        self._stdout_queue = Queue()
+        self._stderr_queue = Queue()
+        self._stdin_queue = Queue()
+
+        self._stdout_reader = self._create_reader_thread(self._proc.stdout, self._stdout_queue)
+        self._stderr_reader = self._create_reader_thread(self._proc.stderr, self._stderr_queue)
+        self._stdin_writer = self._create_writer_thread(self._proc.stdin, self._stdin_queue)
+
+        # WebKitTestRunner is likely still in the process of initializing. The actual waiting
+        # for the startup to finish is done in the WKTRProtocol.
+        self.logger.debug("WebKitTestRunner has been started.")
+
+    def stop(self, force=False):
+        self.logger.debug("Stopping WebKitTestRunner...")
+
+        if self.is_alive():
+            kill_result = self._proc.kill(timeout=5)
+            # This makes sure any left-over child processes get killed.
+            # See http://bugzilla.mozilla.org/show_bug.cgi?id=1760080
+            if force and kill_result != 0:
+                self._proc.kill(9, timeout=5)
+
+        # We need to shut down these queues cleanly to avoid broken pipe error spam in the logs.
+        self._stdout_reader.join(2)
+        self._stderr_reader.join(2)
+
+        self._stdin_queue.put(None)
+        self._stdin_writer.join(2)
+
+        for thread in [self._stdout_reader, self._stderr_reader, self._stdin_writer]:
+            if thread.is_alive():
+                self.logger.warning("WebKitTestRunner IO threads did not shut down gracefully.")
+                return False
+
+        stopped = not self.is_alive()
+        if stopped:
+            self._proc = None
+            self._stdout_queue.close()
+            self.logger.debug("WebKitTestRunner has been stopped.")
+
+            # We sometimes accumulate too many process-related objects,
+            # ultimately running out of OS file handles, via circular
+            # references to them, thus manually trigger a GC while stopping.
+            gc.collect()
+        else:
+            self.logger.warning("WebKitTestRunner failed to stop.")
+
+        return stopped
+
+    def is_alive(self):
+        return self._proc is not None and self._proc.poll() is None
+
+    def pid(self):
+        return self._proc.pid if self._proc else None
+
+    def executor_browser(self):
+        """This function returns the `ExecutorBrowser` object that is used by other
+        processes to interact with WebKitTestRunner. In our case, this consists of the three
+        multiprocessing Queues as well as an `io_stopped` event to signal when the
+        underlying pipes have reached EOF.
+        """
+        return ExecutorBrowser, {"stdout_queue": self._stdout_queue,
+                                 "stderr_queue": self._stderr_queue,
+                                 "stdin_queue": self._stdin_queue}
+
+    def check_crash(self, process, test):
+        return not self.is_alive()
+
+    def _create_reader_thread(self, stream, queue):
+        """This creates (and starts) a background thread which reads lines from `stream` and
+        puts them into `queue` until `stream` reports EOF.
+        """
+        def reader_thread(stream, queue):
+            while True:
+                line = stream.readline()
+                if not line:
+                    break
+
+                queue.put(line)
+
+            queue.close()
+            queue.join_thread()
+
+        result = Thread(target=reader_thread, args=(stream, queue), daemon=True)
+        result.start()
+        return result
+
+    def _create_writer_thread(self, stream, queue):
+        """This creates (and starts) a background thread which gets items from `queue` and
+        writes them into `stream` until it encounters a None item in the queue.
+        """
+        def writer_thread(stream, queue):
+            while True:
+                line = queue.get()
+                if not line:
+                    break
+
+                stream.write(line)
+                stream.flush()
+
+        result = Thread(target=writer_thread, args=(stream, queue), daemon=True)
+        result.start()
+        return result
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/actions.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/actions.py
index a4b689ba921..6a4a0b889e4 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/actions.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/actions.py
@@ -38,6 +38,34 @@ class GetAllCookiesAction:
         return self.protocol.cookies.get_all_cookies()
 
 
+class GetComputedLabelAction:
+    name = "get_computed_label"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        selector = payload["selector"]
+        element = self.protocol.select.element_by_selector(selector)
+        self.logger.debug("Getting computed label for element: %s" % element)
+        return self.protocol.accessibility.get_computed_label(element)
+
+
+class GetComputedRoleAction:
+    name = "get_computed_role"
+
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        selector = payload["selector"]
+        element = self.protocol.select.element_by_selector(selector)
+        self.logger.debug("Getting computed role for element: %s" % element)
+        return self.protocol.accessibility.get_computed_role(element)
+
+
 class GetNamedCookieAction:
     name = "get_named_cookie"
 
@@ -253,6 +281,8 @@ actions = [ClickAction,
            DeleteAllCookiesAction,
            GetAllCookiesAction,
            GetNamedCookieAction,
+           GetComputedLabelAction,
+           GetComputedRoleAction,
            SendKeysAction,
            MinimizeWindowAction,
            SetWindowRectAction,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index 54a57179999..829eca0deb5 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -20,6 +20,7 @@ from .protocol import (BaseProtocolPart,
                        TestharnessProtocolPart,
                        Protocol,
                        SelectorProtocolPart,
+                       AccessibilityProtocolPart,
                        ClickProtocolPart,
                        CookiesProtocolPart,
                        SendKeysProtocolPart,
@@ -186,6 +187,17 @@ class WebDriverSelectorProtocolPart(SelectorProtocolPart):
         return self.webdriver.find.css(selector)
 
 
+class WebDriverAccessibilityProtocolPart(AccessibilityProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def get_computed_label(self, element):
+        return element.get_computed_label()
+
+    def get_computed_role(self, element):
+        return element.get_computed_role()
+
+
 class WebDriverClickProtocolPart(ClickProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
@@ -342,6 +354,7 @@ class WebDriverProtocol(Protocol):
     implements = [WebDriverBaseProtocolPart,
                   WebDriverTestharnessProtocolPart,
                   WebDriverSelectorProtocolPart,
+                  WebDriverAccessibilityProtocolPart,
                   WebDriverClickProtocolPart,
                   WebDriverCookiesProtocolPart,
                   WebDriverSendKeysProtocolPart,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwktr.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwktr.py
new file mode 100644
index 00000000000..ab94000fa20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executorwktr.py
@@ -0,0 +1,268 @@
+# mypy: allow-untyped-defs
+
+from .base import RefTestExecutor, RefTestImplementation, CrashtestExecutor, TestharnessExecutor
+from .protocol import Protocol, ProtocolPart
+from time import time
+from queue import Empty
+from base64 import b64encode
+import json
+
+
+class CrashError(BaseException):
+    pass
+
+
+def _read_line(io_queue, deadline=None, encoding=None, errors="strict", raise_crash=True, logger=None):
+    """Reads a single line from the io queue. The read must succeed before `deadline` or
+    a TimeoutError is raised. The line is returned as a bytestring or optionally with the
+    specified `encoding`. If `raise_crash` is set, a CrashError is raised if the line
+    happens to be a crash message.
+    """
+    current_time = time()
+
+    if deadline and current_time > deadline:
+        raise TimeoutError()
+
+    try:
+        line = io_queue.get(True, deadline - current_time if deadline else None)
+        if raise_crash and line.startswith(b"#CRASHED"):
+            raise CrashError()
+    except Empty:
+        logger.debug(f"got empty line with {time() - deadline} remaining")
+        raise TimeoutError()
+
+    return line.decode(encoding, errors) if encoding else line
+
+
+class WKTRTestPart(ProtocolPart):
+    """This protocol part is responsible for running tests via WebKitTestRunner's protocol mode.
+    """
+    name = "wktr_test"
+    eof_marker = '#EOF\n'  # Marker sent by wktr after blocks.
+
+    def __init__(self, parent):
+        super().__init__(parent)
+        self.stdout_queue = parent.browser.stdout_queue
+        self.stdin_queue = parent.browser.stdin_queue
+
+    def do_test(self, command, timeout=None):
+        """Send a command to wktr and return the resulting outputs.
+
+        A command consists of a URL to navigate to, followed by an optional options; see
+        https://github.com/WebKit/WebKit/blob/main/Tools/TestRunnerShared/TestCommand.cpp.
+
+        """
+        self._send_command(command + "'--timeout'%d" % (timeout * 1000))
+
+        deadline = time() + timeout if timeout else None
+        # The first block can also contain audio data but not in WPT.
+        text = self._read_block(deadline)
+        image = self._read_block(deadline)
+
+        return text, image
+
+    def _send_command(self, command):
+        """Sends a single `command`, i.e. a URL to open, to wktr.
+        """
+        self.stdin_queue.put((command + "\n").encode("utf-8"))
+
+    def _read_block(self, deadline=None):
+        """Tries to read a single block of content from stdout before the `deadline`.
+        """
+        while True:
+            line = _read_line(self.stdout_queue, deadline, "latin-1", logger=self.logger).rstrip()
+
+            if line == "Content-Type: text/plain":
+                return self._read_text_block(deadline)
+
+            if line == "Content-Type: image/png":
+                return self._read_image_block(deadline)
+
+            if line == "#EOF":
+                return None
+
+    def _read_text_block(self, deadline=None):
+        """Tries to read a plain text block in utf-8 encoding before the `deadline`.
+        """
+        result = ""
+
+        while True:
+            line = _read_line(self.stdout_queue, deadline, "utf-8", "replace", False, logger=self.logger)
+
+            if line.endswith(self.eof_marker):
+                result += line[:-len(self.eof_marker)]
+                break
+            elif line.endswith('#EOF\r\n'):
+                result += line[:-len('#EOF\r\n')]
+                self.logger.warning('Got a CRLF-terminated #EOF - this is a driver bug.')
+                break
+
+            result += line
+
+        return result
+
+    def _read_image_block(self, deadline=None):
+        """Tries to read an image block (as a binary png) before the `deadline`.
+        """
+        content_length_line = _read_line(self.stdout_queue, deadline, "utf-8", logger=self.logger)
+        assert content_length_line.startswith("Content-Length:")
+        content_length = int(content_length_line[15:])
+
+        result = bytearray()
+
+        while True:
+            line = _read_line(self.stdout_queue, deadline, raise_crash=False, logger=self.logger)
+            excess = len(line) + len(result) - content_length
+
+            if excess > 0:
+                # This is the line that contains the EOF marker.
+                assert excess == len(self.eof_marker)
+                result += line[:-excess]
+                break
+
+            result += line
+
+        return result
+
+
+class WKTRErrorsPart(ProtocolPart):
+    """This protocol part is responsible for collecting the errors reported by wktr.
+    """
+    name = "wktr_errors"
+
+    def __init__(self, parent):
+        super().__init__(parent)
+        self.stderr_queue = parent.browser.stderr_queue
+
+    def read_errors(self):
+        """Reads the entire content of the stderr queue as is available right now (no blocking).
+        """
+        result = ""
+
+        while not self.stderr_queue.empty():
+            # There is no potential for race conditions here because this is the only place
+            # where we read from the stderr queue.
+            result += _read_line(self.stderr_queue, None, "utf-8", "replace", False, logger=self.logger)
+
+        return result
+
+
+class WKTRProtocol(Protocol):
+    implements = [WKTRTestPart, WKTRErrorsPart]
+
+    def connect(self):
+        pass
+
+    def after_connect(self):
+        pass
+
+    def teardown(self):
+        # Close the queue properly to avoid broken pipe spam in the log.
+        self.browser.stdin_queue.close()
+        self.browser.stdin_queue.join_thread()
+
+    def is_alive(self):
+        """Checks if wktr is alive by determining if the IO pipes are still
+        open. This does not guarantee that the process is responsive.
+        """
+        return self.browser.io_stopped.is_set()
+
+
+def _convert_exception(test, exception, errors):
+    """Converts our TimeoutError and CrashError exceptions into test results.
+    """
+    if isinstance(exception, TimeoutError):
+        return (test.result_cls("EXTERNAL-TIMEOUT", errors), [])
+    if isinstance(exception, CrashError):
+        return (test.result_cls("CRASH", errors), [])
+    raise exception
+
+
+class WKTRRefTestExecutor(RefTestExecutor):
+    def __init__(self, logger, browser, server_config, timeout_multiplier=1, screenshot_cache=None,
+            debug_info=None, reftest_screenshot="unexpected", **kwargs):
+        super().__init__(logger, browser, server_config, timeout_multiplier, screenshot_cache,
+                debug_info, reftest_screenshot, **kwargs)
+        self.implementation = RefTestImplementation(self)
+        self.protocol = WKTRProtocol(self, browser)
+
+    def reset(self):
+        self.implementation.reset()
+
+    def do_test(self, test):
+        try:
+            result = self.implementation.run_test(test)
+            self.protocol.wktr_errors.read_errors()
+            return self.convert_result(test, result)
+        except BaseException as exception:
+            return _convert_exception(test, exception, self.protocol.wktr_errors.read_errors())
+
+    def screenshot(self, test, viewport_size, dpi, page_ranges):
+        assert dpi is None
+        command = self.test_url(test)
+        command += "'--pixel-test'"
+        assert not self.is_print
+        _, image = self.protocol.wktr_test.do_test(
+            command, test.timeout * self.timeout_multiplier)
+
+        if not image:
+            return False, ("ERROR", self.protocol.wktr_errors.read_errors())
+
+        return True, b64encode(image).decode()
+
+    def wait(self):
+        return
+
+
+class WKTRCrashtestExecutor(CrashtestExecutor):
+    def __init__(self, logger, browser, server_config, timeout_multiplier=1, debug_info=None,
+            **kwargs):
+        super().__init__(logger, browser, server_config, timeout_multiplier, debug_info, **kwargs)
+        self.protocol = WKTRProtocol(self, browser)
+
+    def do_test(self, test):
+        try:
+            _ = self.protocol.wktr_test.do_test(self.test_url(test), test.timeout * self.timeout_multiplier)
+            self.protocol.wktr_errors.read_errors()
+            return self.convert_result(test, {"status": "PASS", "message": None})
+        except BaseException as exception:
+            return _convert_exception(test, exception, self.protocol.wktr_errors.read_errors())
+
+    def wait(self):
+        return
+
+
+class WKTRTestharnessExecutor(TestharnessExecutor):
+    def __init__(self, logger, browser, server_config, timeout_multiplier=1, debug_info=None,
+            **kwargs):
+        super().__init__(logger, browser, server_config, timeout_multiplier, debug_info, **kwargs)
+        self.protocol = WKTRProtocol(self, browser)
+
+    def do_test(self, test):
+        try:
+            text, _ = self.protocol.wktr_test.do_test(self.test_url(test),
+                    test.timeout * self.timeout_multiplier)
+
+            errors = self.protocol.wktr_errors.read_errors()
+            if not text:
+                return (test.result_cls("ERROR", errors), [])
+
+            output = None
+            output_prefix = "CONSOLE MESSAGE: WPTRUNNER OUTPUT:"
+
+            for line in text.split("\n"):
+                if line.startswith(output_prefix):
+                    if output is None:
+                        output = line[len(output_prefix):]
+                    else:
+                        return (test.result_cls("ERROR", "multiple wptrunner outputs"), [])
+
+            if output is None:
+                return (test.result_cls("ERROR", "no wptrunner output"), [])
+
+            return self.convert_result(test, json.loads(output))
+        except BaseException as exception:
+            return _convert_exception(test, exception, self.protocol.wktr_errors.read_errors())
+
+    def wait(self):
+        return
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
index 75e113c71d3..af64cc855e2 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/protocol.py
@@ -299,6 +299,27 @@ class ClickProtocolPart(ProtocolPart):
         pass
 
 
+
+class AccessibilityProtocolPart(ProtocolPart):
+    """Protocol part for accessibility introspection"""
+    __metaclass__ = ABCMeta
+
+    name = "accessibility"
+
+    @abstractmethod
+    def get_computed_label(self, element):
+        """Return the computed accessibility label for a specific element.
+
+        :param element: A protocol-specific handle to an element."""
+        pass
+
+    def get_computed_role(self, element):
+        """Return the computed accessibility role for a specific element.
+
+        :param element: A protocol-specific handle to an element."""
+        pass
+
+
 class CookiesProtocolPart(ProtocolPart):
     """Protocol part for managing cookies"""
     __metaclass__ = ABCMeta
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
index 94a9a971256..716da040bbc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -180,6 +180,18 @@
         return create_action("get_all_cookies", {context});
     };
 
+    window.test_driver_internal.get_computed_label = function(element) {
+        const selector = get_selector(element);
+        const context = get_context(element);
+        return create_action("get_computed_label", {selector, context});
+    };
+
+    window.test_driver_internal.get_computed_role = function(element) {
+        const selector = get_selector(element);
+        const context = get_context(element);
+        return create_action("get_computed_role", {selector, context});
+    };
+
     window.test_driver_internal.get_named_cookie = function(name, context=null) {
         return create_action("get_named_cookie", {name, context});
     };
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js
new file mode 100644
index 00000000000..b7d350a4262
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testharnessreport-wktr.js
@@ -0,0 +1,23 @@
+var props = {output:%(output)d, debug: %(debug)s};
+var start_loc = document.createElement('a');
+start_loc.href = location.href;
+setup(props);
+
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+
+add_completion_callback(function (tests, harness_status) {
+    var id = decodeURIComponent(start_loc.pathname) + decodeURIComponent(start_loc.search) + decodeURIComponent(start_loc.hash);
+    var result_string = JSON.stringify([
+        id,
+        harness_status.status,
+        harness_status.message,
+        harness_status.stack,
+        tests.map(function(t) {
+            return [t.name, t.status, t.message, t.stack]
+        }),
+    ]);
+
+    console.log("WPTRUNNER OUTPUT:" + result_string);
+    testRunner.notifyDone();
+});
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 d040d081c6d..347caf49ab0 100644
--- a/tests/wpt/web-platform-tests/url/resources/setters_tests.json
+++ b/tests/wpt/web-platform-tests/url/resources/setters_tests.json
@@ -1061,6 +1061,42 @@
                 "host": "",
                 "hostname": ""
             }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "a%C2%ADb",
+            "expected": {
+                "href": "https://ab/",
+                "host": "ab",
+                "hostname": "ab"
+            }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "\u00AD",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com"
+            }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "%C2%AD",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com"
+            }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "xn--",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com"
+            }
         }
     ],
     "hostname": [
@@ -1436,6 +1472,42 @@
                 "host": "",
                 "hostname": ""
             }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "a%C2%ADb",
+            "expected": {
+                "href": "https://ab/",
+                "host": "ab",
+                "hostname": "ab"
+            }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "\u00AD",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com"
+            }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "%C2%AD",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com"
+            }
+        },
+        {
+            "href": "https://example.com/",
+            "new_value": "xn--",
+            "expected": {
+                "href": "https://example.com/",
+                "host": "example.com",
+                "hostname": "example.com"
+            }
         }
     ],
     "port": [
diff --git a/tests/wpt/web-platform-tests/url/resources/toascii.json b/tests/wpt/web-platform-tests/url/resources/toascii.json
index 4cb41e94cd4..bca28b4a1e4 100644
--- a/tests/wpt/web-platform-tests/url/resources/toascii.json
+++ b/tests/wpt/web-platform-tests/url/resources/toascii.json
@@ -160,23 +160,6 @@
     "input": "a\u00ADb",
     "output": "ab"
   },
-  {
-    "input": "a%C2%ADb",
-    "output": "ab"
-  },
-  {
-    "comment": "Empty host after domain to ASCII",
-    "input": "\u00AD",
-    "output": null
-  },
-  {
-    "input": "%C2%AD",
-    "output": null
-  },
-  {
-    "input": "xn--",
-    "output": null
-  },
   {
     "comment": "Interesting UseSTD3ASCIIRules=false cases",
     "input": "≠",
diff --git a/tests/wpt/web-platform-tests/url/resources/urltestdata.json b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
index 19f9ecddbee..eb414860f27 100644
--- a/tests/wpt/web-platform-tests/url/resources/urltestdata.json
+++ b/tests/wpt/web-platform-tests/url/resources/urltestdata.json
@@ -8892,5 +8892,36 @@
     "protocol": "https:",
     "search": "",
     "username": ""
+  },
+  {
+    "input": "https://a%C2%ADb/",
+    "base": "about:blank",
+    "hash": "",
+    "host": "ab",
+    "hostname": "ab",
+    "href": "https://ab/",
+    "origin": "https://ab",
+    "password": "",
+    "pathname": "/",
+    "port": "",
+    "protocol": "https:",
+    "search": "",
+    "username": ""
+  },
+  {
+    "comment": "Empty host after domain to ASCII",
+    "input": "https://\u00AD/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://%C2%AD/",
+    "base": "about:blank",
+    "failure": true
+  },
+  {
+    "input": "https://xn--/",
+    "base": "about:blank",
+    "failure": true
   }
 ]
diff --git a/tests/wpt/web-platform-tests/wai-aria/role/basic.html b/tests/wpt/web-platform-tests/wai-aria/role/basic.html
new file mode 100644
index 00000000000..d371aa72dcb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wai-aria/role/basic.html
@@ -0,0 +1,23 @@
+<!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>
+
+<div id='d' style='height: 100px; width: 100px' role="group" aria-label="test label"></div>
+<h1 id="h">test heading</h1>
+<script>
+
+promise_test(async t => {
+  const role = await test_driver.get_computed_role(document.getElementById('d'));
+  assert_true(role == "group");
+}, "tests explicit role");
+
+
+promise_test(async t => {
+  const role = await test_driver.get_computed_role(document.getElementById('h'));
+  assert_true(role == "heading");
+}, "tests implicit role");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/__init__.py
index d0451d0f285..ea7472cfd3d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/__init__.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/__init__.py
@@ -90,7 +90,6 @@ def assert_request_data(request_data, expected_request):
 def assert_base_parameters(
     event,
     context=None,
-    is_redirect=None,
     redirect_count=None,
     expected_request=None,
 ):
@@ -98,7 +97,6 @@ def assert_base_parameters(
         {
             "context": any_string_or_null,
             "navigation": any_string_or_null,
-            "isRedirect": any_bool,
             "redirectCount": any_int,
             "request": any_dict,
             "timestamp": any_int,
@@ -109,9 +107,6 @@ def assert_base_parameters(
     if context is not None:
         assert event["context"] == context
 
-    if is_redirect is not None:
-        assert event["isRedirect"] == is_redirect
-
     if redirect_count is not None:
         assert event["redirectCount"] == redirect_count
 
@@ -123,7 +118,6 @@ def assert_base_parameters(
 def assert_before_request_sent_event(
     event,
     context=None,
-    is_redirect=None,
     redirect_count=None,
     expected_request=None,
 ):
@@ -135,7 +129,6 @@ def assert_before_request_sent_event(
     assert_base_parameters(
         event,
         context=context,
-        is_redirect=is_redirect,
         redirect_count=redirect_count,
         expected_request=expected_request,
     )
@@ -171,7 +164,6 @@ def assert_response_data(response_data, expected_response):
 def assert_response_event(
     event,
     context=None,
-    is_redirect=None,
     redirect_count=None,
     expected_request=None,
     expected_response=None,
@@ -185,7 +177,6 @@ def assert_response_event(
     assert_base_parameters(
         event,
         context=context,
-        is_redirect=is_redirect,
         redirect_count=redirect_count,
         expected_request=expected_request,
     )
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_tentative.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_tentative.py
index 1711f5177fe..0afa439c822 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_tentative.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/before_request_sent/before_request_sent_tentative.py
@@ -50,7 +50,6 @@ async def test_subscribe_status(bidi_session, top_context, wait_for_event, url,
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
     await bidi_session.session.unsubscribe(events=["network.beforeRequestSent"])
@@ -87,7 +86,6 @@ async def test_load_page_twice(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -122,7 +120,6 @@ async def test_request_method(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -150,7 +147,6 @@ async def test_request_headers(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -184,7 +180,6 @@ async def test_request_cookies(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
     await bidi_session.script.evaluate(
@@ -211,7 +206,6 @@ async def test_request_cookies(
         events[1],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -239,11 +233,10 @@ async def test_redirect(bidi_session, wait_for_event, url, fetch, setup_network_
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
     expected_request = {"method": "GET", "url": text_url}
     assert_before_request_sent_event(
-        events[1], expected_request=expected_request, redirect_count=1, is_redirect=True
+        events[1], expected_request=expected_request, redirect_count=1
     )
 
     # Check that both requests share the same requestId
@@ -279,16 +272,14 @@ async def test_redirect_http_equiv(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
     # http-equiv redirect should not be considered as a redirect: redirect_count
-    # should be 0 and is_redirect should be false.
+    # should be 0.
     expected_request = {"method": "GET", "url": redirected_url}
     assert_before_request_sent_event(
         events[1],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
     # Check that the http-equiv redirect request has a different requestId
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed_tentative.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed_tentative.py
index 347f970c61d..b129859e7ed 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed_tentative.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_completed/response_completed_tentative.py
@@ -59,7 +59,6 @@ async def test_subscribe_status(bidi_session, top_context, wait_for_event, url,
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
     text_url = url(PAGE_EMPTY_TEXT)
@@ -81,7 +80,6 @@ async def test_subscribe_status(bidi_session, top_context, wait_for_event, url,
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
     await bidi_session.session.unsubscribe(events=[RESPONSE_COMPLETED_EVENT])
@@ -127,7 +125,6 @@ async def test_load_page_twice(
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -164,7 +161,6 @@ async def test_response_status(
         events[0],
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -202,7 +198,6 @@ async def test_response_headers(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -236,7 +231,6 @@ async def test_response_mime_type_file(
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -263,11 +257,10 @@ async def test_redirect(bidi_session, wait_for_event, url, fetch, setup_network_
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
     expected_request = {"method": "GET", "url": text_url}
     assert_response_event(
-        events[1], expected_request=expected_request, redirect_count=1, is_redirect=True
+        events[1], expected_request=expected_request, redirect_count=1
     )
 
     # Check that both requests share the same requestId
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started_tentative.py b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started_tentative.py
index 18c78c6922a..b1a0741f202 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started_tentative.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/bidi/network/response_started/response_started_tentative.py
@@ -61,7 +61,6 @@ async def test_subscribe_status(bidi_session, top_context, wait_for_event, url,
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
     await bidi_session.session.unsubscribe(events=[RESPONSE_STARTED_EVENT])
@@ -107,7 +106,6 @@ async def test_load_page_twice(
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -142,7 +140,6 @@ async def test_response_status(
         events[0],
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -180,7 +177,6 @@ async def test_response_headers(
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -214,7 +210,6 @@ async def test_response_mime_type_file(
         expected_request=expected_request,
         expected_response=expected_response,
         redirect_count=0,
-        is_redirect=False,
     )
 
 
@@ -239,11 +234,10 @@ async def test_redirect(bidi_session, wait_for_event, url, fetch, setup_network_
         events[0],
         expected_request=expected_request,
         redirect_count=0,
-        is_redirect=False,
     )
     expected_request = {"method": "GET", "url": text_url}
     assert_response_event(
-        events[1], expected_request=expected_request, redirect_count=1, is_redirect=True
+        events[1], expected_request=expected_request, redirect_count=1
     )
 
     # Check that both requests share the same requestId
diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html b/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html
index 4925850ff03..770aa49f052 100644
--- a/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html
+++ b/tests/wpt/web-platform-tests/webrtc-extensions/RTCRtpTransceiver-headerExtensionControl.html
@@ -10,104 +10,102 @@
 'use strict';
 
 async function negotiate(pc1, pc2) {
-  const offer = await pc1.createOffer();
-  await pc1.setLocalDescription(offer);
-  await pc2.setRemoteDescription(offer);
-  const answer = await pc2.createAnswer();
-  await pc2.setLocalDescription(answer);
-  await pc1.setRemoteDescription(answer);
+  await pc1.setLocalDescription();
+  await pc2.setRemoteDescription(pc1.localDescription);
+  await pc2.setLocalDescription();
+  await pc1.setRemoteDescription(pc2.localDescription);
 }
 
 test(function(t) {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('video');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   let capability = capabilities.find((capability) => {
       return capability.uri == "urn:ietf:params:rtp-hdrext:sdes:mid" &&
              capability.direction != "stopped";
   });
   assert_not_equals(capability, undefined);
-}, `the video transceiver.headerExtensionsToOffer() includes mandatory extensions`);
+}, `the video transceiver.getHeaderExtensionsToNegotiate() includes mandatory extensions`);
 
 test(function(t) {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('audio');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   let capability = capabilities.find((capability) => {
       return capability.uri == "urn:ietf:params:rtp-hdrext:sdes:mid" &&
              capability.direction != "stopped";
   });
   assert_not_equals(capability, undefined);
-}, `the audio transceiver.headerExtensionsToOffer() includes mandatory extensions`);
+}, `the audio transceiver.getHeaderExtensionsToNegotiate() includes mandatory extensions`);
 
 test(function(t) {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('audio');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   capabilities[0].uri = "";
   assert_throws_js(TypeError, () => {
-    transceiver.setOfferedRtpHeaderExtensions(capabilities);
+    transceiver.setHeaderExtensionsToNegotiate(capabilities);
   }, 'transceiver should throw TypeError when setting an empty URI');
-}, `setOfferedRtpHeaderExtensions throws TypeError on encountering missing URI`);
+}, `setHeaderExtensionsToNegotiate throws TypeError on encountering missing URI`);
 
 test(function(t) {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('audio');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   capabilities[0].uri = "4711";
   assert_throws_dom("NotSupportedError", () => {
-    transceiver.setOfferedRtpHeaderExtensions(capabilities);
+    transceiver.setHeaderExtensionsToNegotiate(capabilities);
   }, 'transceiver should throw NotSupported when setting an unknown URI');
-}, `setOfferedRtpHeaderExtensions throws NotSupported on encountering unknown URI`);
+}, `setHeaderExtensionsToNegotiate throws NotSupported on encountering unknown URI`);
 
 test(function(t) {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('audio');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   let capability = capabilities.find((capability) => {
       return capability.uri == "urn:ietf:params:rtp-hdrext:sdes:mid";
   });
   ["sendonly", "recvonly", "inactive", "stopped"].map(direction => {
     capability.direction = direction;
     assert_throws_dom("InvalidModificationError", () => {
-      transceiver.setOfferedRtpHeaderExtensions(capabilities);
+      transceiver.setHeaderExtensionsToNegotiate(capabilities);
     }, `transceiver should throw InvalidModificationError when setting a mandatory header extension\'s direction to ${direction}`);
   });
-}, `setOfferedRtpHeaderExtensions throws InvalidModificationError when setting a mandatory header extension\'s direction to something else than "sendrecv"`);
+}, `setHeaderExtensionsToNegotiate throws InvalidModificationError when setting a mandatory header extension\'s direction to something else than "sendrecv"`);
 
 test(function(t) {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('audio');
-  let capabilities = transceiver.headerExtensionsToOffer;
+  let capabilities = transceiver.getHeaderExtensionsToNegotiate();
   let selected_capability = capabilities.find((capability) => {
       return capability.direction == "sendrecv" &&
              capability.uri != "urn:ietf:params:rtp-hdrext:sdes:mid";
   });
   selected_capability.direction = "stopped";
-  const offered_capabilities = transceiver.headerExtensionsToOffer;
+  const offered_capabilities = transceiver.getHeaderExtensionsToNegotiate;
   let altered_capability = capabilities.find((capability) => {
       return capability.uri == selected_capability.uri &&
              capability.direction == "stopped";
   });
   assert_not_equals(altered_capability, undefined);
-}, `modified direction set by setOfferedRtpHeaderExtensions is visible in headerExtensionsOffered`);
+}, `modified direction set by setHeaderExtensionsToNegotiate is visible in headerExtensionsOffered`);
 
 promise_test(async t => {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('video');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   const offer = await pc.createOffer();
   const extmaps = offer
                       .sdp
                       .split("\n")
-                      .filter(line => { return line.includes("a=extmap"); })
+                      .filter(line => { return line.includes("a=extmap:"); })
                       .join("\n");
   for (const capability of capabilities) {
     if (capability.direction == "stopped") {
@@ -122,18 +120,18 @@ promise_test(async t => {
   const pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   const transceiver = pc.addTransceiver('video');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   const selected_capability = capabilities.find((capability) => {
       return capability.direction == "sendrecv" &&
              capability.uri != "urn:ietf:params:rtp-hdrext:sdes:mid";
   });
   selected_capability.direction = "stopped";
-  transceiver.setOfferedRtpHeaderExtensions(capabilities);
+  transceiver.setHeaderExtensionsToNegotiate(capabilities);
   const offer = await pc.createOffer();
   const extmaps = offer
                       .sdp
                       .split("\n")
-                      .filter(line => { return line.includes("a=extmap"); })
+                      .filter(line => { return line.includes("a=extmap:"); })
                       .join("\n");
   for (const capability of capabilities) {
     if (capability.direction == "stopped") {
@@ -152,25 +150,25 @@ promise_test(async t => {
 
   // Disable a non-mandatory extension before first negotiation.
   const transceiver = pc1.addTransceiver('video');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   const selected_capability = capabilities.find((capability) => {
       return capability.direction == "sendrecv" &&
              capability.uri != "urn:ietf:params:rtp-hdrext:sdes:mid";
   });
   selected_capability.direction = "stopped";
-  transceiver.setOfferedRtpHeaderExtensions(capabilities);
+  transceiver.setHeaderExtensionsToNegotiate(capabilities);
 
   await negotiate(pc1, pc2);
-  const negotiated_capabilites = transceiver.headerExtensionsNegotiated;
+  const negotiated_capabilites = transceiver.getNegotiatedHeaderExtensions();
 
   // Attempt enabling the extension.
   selected_capability.direction = "sendrecv";
 
   // The enabled extension should not be part of the negotiated set.
-  transceiver.setOfferedRtpHeaderExtensions(capabilities);
+  transceiver.setHeaderExtensionsToNegotiate(capabilities);
   await negotiate(pc1, pc2);
   assert_not_equals(
-      transceiver.headerExtensionsNegotiated.find(capability => {
+      transceiver.getNegotiatedHeaderExtensions().find(capability => {
         return capability.uri == selected_capability.uri &&
                capability.direction == "sendrecv";
       }), undefined);
@@ -184,16 +182,16 @@ promise_test(async t => {
 
   // Disable a non-mandatory extension before first negotiation.
   const transceiver = pc1.addTransceiver('video');
-  const capabilities = transceiver.headerExtensionsToOffer;
+  const capabilities = transceiver.getHeaderExtensionsToNegotiate();
   const selected_capability = capabilities.find((capability) => {
       return capability.direction == "sendrecv" &&
              capability.uri != "urn:ietf:params:rtp-hdrext:sdes:mid";
   });
   selected_capability.direction = "stopped";
-  transceiver.setOfferedRtpHeaderExtensions(capabilities);
+  transceiver.setHeaderExtensionsToNegotiate(capabilities);
 
   await negotiate(pc1, pc2);
-  const negotiated_capabilites = transceiver.headerExtensionsNegotiated;
+  const negotiated_capabilites = transceiver.getNegotiatedHeaderExtensions();
 
   for (const capability of negotiated_capabilites) {
     assert_not_equals(capabilities.find((cap) => {
@@ -217,15 +215,15 @@ promise_test(async t => {
   const t2 = pc.addTransceiver('video');
   const extensionUri = 'urn:3gpp:video-orientation';
 
-  assert_true(!!t1.headerExtensionsToOffer.find(ext => ext.uri === extensionUri));
-  const ext1 = t1.headerExtensionsToOffer;
+  assert_true(!!t1.getHeaderExtensionsToNegotiate().find(ext => ext.uri === extensionUri));
+  const ext1 = t1.getHeaderExtensionsToNegotiate();
   ext1.find(ext => ext.uri === extensionUri).direction = 'stopped';
-  t1.setOfferedRtpHeaderExtensions(ext1);
+  t1.setHeaderExtensionsToNegotiate(ext1);
 
-  assert_true(!!t2.headerExtensionsToOffer.find(ext => ext.uri === extensionUri));
-  const ext2 = t2.headerExtensionsToOffer;
+  assert_true(!!t2.getHeaderExtensionsToNegotiate().find(ext => ext.uri === extensionUri));
+  const ext2 = t2.getHeaderExtensionsToNegotiate();
   ext2.find(ext => ext.uri === extensionUri).direction = 'sendrecv';
-  t2.setOfferedRtpHeaderExtensions(ext2);
+  t2.setHeaderExtensionsToNegotiate(ext2);
 
   const offer = await pc.createOffer();
   const sections = SDPUtils.splitSections(offer.sdp);